Commit f37ed85a authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by The Qt Project
Browse files

don't emit comments to generated qfeatures.h


the file is not meant to be human-readable and even less editable, so
there is no point in having comments in it.

also, it was completely inconsistent to start with: features without
dependencies were listed as "templates" in form of commented out
 #defines to disable them manually, while features with dependencies
had a respective #ifdef block to be automatically disabled, but no
"template" to disable them manually. now only the #ifdef blocks remain.
the actual configuration is done by configure via qconfig.h.

Change-Id: I8b9e56ba570908dad4cc6dfcd24bf0e1da8b290f
Reviewed-by: default avatarTasuku Suzuki <stasuku@gmail.com>
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 08a737de
Branches
Tags
Showing with 2 additions and 7 deletions
...@@ -127,17 +127,12 @@ features = $$sort_depends(features, features.) ...@@ -127,17 +127,12 @@ features = $$sort_depends(features, features.)
features = $$reverse(features) features = $$reverse(features)
FEATURES_H = \ FEATURES_H = \
"/*" \ "/*" \
" * All features and their dependencies." \ " * All feature dependencies." \
" *" \ " *" \
" * This list is generated by qmake from <qtbase>/src/corelib/global/qfeatures.txt" \ " * This list is generated by qmake from <qtbase>/src/corelib/global/qfeatures.txt" \
" */" " */"
for (ft, features) { for (ft, features) {
FEATURES_H += \ !isEmpty(features.$${ft}.depends) {
"$$escape_expand(\\n)// $$eval(features.$${ft}.name)"
isEmpty(features.$${ft}.depends) {
FEATURES_H += \
"//$${LITERAL_HASH}define QT_NO_$$ft"
} else {
FEATURES_H += \ FEATURES_H += \
"$${LITERAL_HASH}if !defined(QT_NO_$$ft) && ($$join($$list($$split(features.$${ft}.depends)), ") || defined(QT_NO_", "defined(QT_NO_", ")"))" \ "$${LITERAL_HASH}if !defined(QT_NO_$$ft) && ($$join($$list($$split(features.$${ft}.depends)), ") || defined(QT_NO_", "defined(QT_NO_", ")"))" \
"$${LITERAL_HASH} define QT_NO_$$ft" \ "$${LITERAL_HASH} define QT_NO_$$ft" \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment