diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-24 20:54:49 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-29 15:38:02 +0100 |
commit | f37ed85a55f977159ea79d6ecbefd857d7d6cb63 (patch) | |
tree | b703aee5bfcbe2746ba002a52903dafc6db1a4d9 | |
parent | 08a737def9145a53615871bb5900f9794bf699f5 (diff) |
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: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r-- | qtbase.pro | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/qtbase.pro b/qtbase.pro index afdeed853c..3fc759615b 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -127,17 +127,12 @@ features = $$sort_depends(features, features.) features = $$reverse(features) FEATURES_H = \ "/*" \ - " * All features and their dependencies." \ + " * All feature dependencies." \ " *" \ " * This list is generated by qmake from <qtbase>/src/corelib/global/qfeatures.txt" \ " */" for (ft, features) { - FEATURES_H += \ - "$$escape_expand(\\n)// $$eval(features.$${ft}.name)" - isEmpty(features.$${ft}.depends) { - FEATURES_H += \ - "//$${LITERAL_HASH}define QT_NO_$$ft" - } else { + !isEmpty(features.$${ft}.depends) { FEATURES_H += \ "$${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" \ |