summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-07-14 21:13:11 +0200
committerLars Knoll <lars.knoll@qt.io>2016-08-10 15:42:17 +0000
commit53e06e68b6c675e3d3d6f49e23a6466e3404d377 (patch)
tree9823e27a5fe4db0dc696262c1332945342aaeb06 /configure.pri
parent865d80fdb536af7eb17094787444f010313594b5 (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 'configure.pri')
-rw-r--r--configure.pri8
1 files changed, 4 insertions, 4 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