diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-14 21:13:11 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-10 15:42:17 +0000 |
| commit | 53e06e68b6c675e3d3d6f49e23a6466e3404d377 (patch) | |
| tree | 9823e27a5fe4db0dc696262c1332945342aaeb06 /mkspecs/features | |
| parent | 865d80fdb536af7eb17094787444f010313594b5 (diff) | |
fix passing arguments with spaces to configure -D/-I/-L/-F
Change-Id: Ic03e487e5988fa38246975b52d1494af58ccb22f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index c4dda1b568..e815baebf1 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -415,13 +415,13 @@ defineTest(qtConfTest_compile) { # add compiler flags, these are set for the target and should not be applied to host tests !isEmpty(EXTRA_DEFINES): \ - qmake_args += "\"DEFINES += $$EXTRA_DEFINES\"" + qmake_args += $$system_quote(DEFINES += $$val_escape(EXTRA_DEFINES)) !isEmpty(EXTRA_LIBDIR) \ - qmake_args += "\"QMAKE_LIBDIR += $$EXTRA_LIBDIR\"" + qmake_args += $$system_quote(QMAKE_LIBDIR += $$val_escape(EXTRA_LIBDIR)) !isEmpty(EXTRA_FRAMEWORKPATH) \ - qmake_args += "\"QMAKE_FRAMEWORKPATH += $$EXTRA_FRAMEWORKPATH\"" + qmake_args += $$system_quote(QMAKE_FRAMEWORKPATH += $$val_escape(EXTRA_FRAMEWORKPATH)) !isEmpty(EXTRA_INCLUDEPATH): \ - qmake_args += "\"INCLUDEPATH += $$EXTRA_INCLUDEPATH\"" + qmake_args += $$system_quote(INCLUDEPATH += $$val_escape(EXTRA_INCLUDEPATH)) qmake_args += $$EXTRA_QMAKE_ARGS } |