fix passing arguments with spaces to configure -D/-I/-L/-F

Change-Id: Ic03e487e5988fa38246975b52d1494af58ccb22f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 8 insertions, 8 deletions

diff --git a/configure.pri b/configure.pri
index 7625074c50..cdded4f2d4 100644
--- a/configure.pri
+++ b/configure.pri
@@ -576,23 +576,23 @@ defineTest(qtConfOutput_compilerFlags) {
     !isEmpty(config.input.defines) {
         EXTRA_DEFINES += $$config.input.defines
         export(EXTRA_DEFINES)
-        output += "EXTRA_DEFINES += $$config.input.defines"
+        output += "EXTRA_DEFINES += $$val_escape(config.input.defines)"
     }
     !isEmpty(config.input.includes) {
         EXTRA_INCLUDEPATH += $$config.input.includes
         export(EXTRA_INCLUDEPATH)
-        output += "EXTRA_INCLUDEPATH += $$config.input.includes"
+        output += "EXTRA_INCLUDEPATH += $$val_escape(config.input.includes)"
     }
 
     !isEmpty(config.input.lpaths) {
         EXTRA_LIBDIR += $$config.input.lpaths
         export(EXTRA_LIBDIR)
-        output += "EXTRA_LIBDIR += $$config.input.lpaths"
+        output += "EXTRA_LIBDIR += $$val_escape(config.input.lpaths)"
     }
     darwin:!isEmpty(config.input.fpaths) {
         EXTRA_FRAMEWORKPATH += $$config.input.fpaths
         export(EXTRA_FRAMEWORKPATH)
-        output += "EXTRA_FRAMEWORKPATH += $$config.input.fpaths"
+        output += "EXTRA_FRAMEWORKPATH += $$val_escape(config.input.fpaths)"
     }
 
     config.output.privatePro += $$output
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
     }