summaryrefslogtreecommitdiff
path: root/qtbase.pro
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-11-11 18:26:06 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-11-13 14:33:16 +0100
commit4f3a1f49680fa53186b2f2673d26fc6bc3288a94 (patch)
treee60abbd0d0066a0ea837c90dfe05f5c500551f9e /qtbase.pro
parent034ff4deaf3e4c998f4572705a1c7624c8499c92 (diff)
downloadqtbase-4f3a1f49680fa53186b2f2673d26fc6bc3288a94.tar.gz
remove nonsensical claim about contains()
the string is implicitly anchored, so "foo" does of course not match "no-foo". this allows us to de-noise the generated qfeatures.pri somewhat. it still makes sense not to auto-include that file for performance reasons, so this change is a functional no-op. Change-Id: Ied75fd6459022c0b8c80843d62c4ab9eba9bf261 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qtbase.pro')
-rw-r--r--qtbase.pro5
1 files changed, 3 insertions, 2 deletions
diff --git a/qtbase.pro b/qtbase.pro
index d6861cf09f..6d0de44f6d 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -140,7 +140,7 @@ for (ft, features) {
"$${LITERAL_HASH} define QT_NO_$$ft" \
"$${LITERAL_HASH}endif"
FEATURES_PRI += \
- "contains(QT_DISABLED_FEATURES, "^($$lower($$join($$list($$replace(features.$${ft}.depends, _, -)), "|")))$"): \\" \
+ "contains(QT_DISABLED_FEATURES, "$$lower($$join($$list($$replace(features.$${ft}.depends, _, -)), "|"))"): \\" \
" QT_DISABLED_FEATURES += $$lower($$replace(ft, _, -))"
}
}
@@ -168,7 +168,8 @@ for (def, QT_NO_DEFINES) {
}
no_features = $$unique(no_features)
-# Can't simply add these to QT_CONFIG, as e.g., contains(QT_CONFIG, accessibility) matches no-accessibililty.
+# Don't simply add these to QT_CONFIG, as then one might expect them to be there without load(qfeatures).
+# And we don't want to do that automatically, as the dynamic dependency resolution is somewhat expensive.
FEATURES_PRI = \
"$${LITERAL_HASH} Features disabled by configure:" \
"QT_DISABLED_FEATURES =$$lower($$join($$list($$replace(no_features, _, -)), " ", " "))" \