Skip to content

Commit

Permalink
remove nonsensical claim about contains()
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
ossilator committed Nov 13, 2014
1 parent 034ff4d commit 4f3a1f4
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions qtbase.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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, _, -))"
}
}
Expand Down Expand Up @@ -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, _, -)), " ", " "))" \
Expand Down

0 comments on commit 4f3a1f4

Please sign in to comment.