diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-15 20:43:44 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-10 15:43:02 +0000 |
| commit | 08f6545dcb37b661e63c42c4996fb4ed737070f4 (patch) | |
| tree | 43a7d1e54198712ecd6fe58526d6e4a00716c5b6 /mkspecs | |
| parent | bcd0653e10f86b5f9280151684e452fd6de1f36a (diff) | |
fix over-quoting of OPENSSL_LIBS and QT_HOST_CFLAGS_DBUS
we pass the pre-quoted value directly to the output function, which
adds another layer of quoting. to avoid over-quoting, introduce the
'eval' attribute which sends the value through eval() first, thus
removing the extra quoting.
Change-Id: Ic63a50cb7eccc61b0f730476e124339aeb95586c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 07338ffe9d..84891a83e5 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -983,6 +983,8 @@ defineTest(qtConfOutputVarHelper) { error("Output type 'var$$title($$1)' used in feature '$$eval($${2}.feature)' without a 'name' entry.") value = $$qtConfEvaluate($$eval($${2}.value)) + !isEmpty($${2}.eval):$$qtConfEvaluate($$eval($${2}.eval)): \ + eval(value = $$value) qtConfOutputVar($$1, $$output, $$name, $$value) } |