1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove nonsensical claim about contains()

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2014-11-11 18:26:06 +01:00
parent 034ff4deaf
commit 4f3a1f4968
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qtbase.pro
View File

@ -140,7 +140,7 @@ for (ft, features) {
"$${LITERAL_HASH} define QT_NO_$$ft" \ "$${LITERAL_HASH} define QT_NO_$$ft" \
"$${LITERAL_HASH}endif" "$${LITERAL_HASH}endif"
FEATURES_PRI += \ 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, _, -))" " QT_DISABLED_FEATURES += $$lower($$replace(ft, _, -))"
} }
} }
@ -168,7 +168,8 @@ for (def, QT_NO_DEFINES) {
} }
no_features = $$unique(no_features) 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 = \ FEATURES_PRI = \
"$${LITERAL_HASH} Features disabled by configure:" \ "$${LITERAL_HASH} Features disabled by configure:" \
"QT_DISABLED_FEATURES =$$lower($$join($$list($$replace(no_features, _, -)), " ", " "))" \ "QT_DISABLED_FEATURES =$$lower($$join($$list($$replace(no_features, _, -)), " ", " "))" \