From f37ed85a55f977159ea79d6ecbefd857d7d6cb63 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu, 24 Oct 2013 20:54:49 +0200
Subject: [PATCH] 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>
---
qtbase.pro | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/qtbase.pro b/qtbase.pro
index afdeed853c0..3fc759615b2 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" \
--
GitLab