AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't emit comments to generated qfeatures.h

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2013-10-24 20:54:49 +02:00 committed by The Qt Project
parent 08a737def9
commit f37ed85a55
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qtbase.pro
View File

@ -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" \