1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ic03e487e5988fa38246975b52d1494af58ccb22f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-07-14 21:13:11 +02:00 committed by Lars Knoll
parent 865d80fdb5
commit 53e06e68b6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.pri
View File

@ -576,23 +576,23 @@ defineTest(qtConfOutput_compilerFlags) {
!isEmpty(config.input.defines) { !isEmpty(config.input.defines) {
EXTRA_DEFINES += $$config.input.defines EXTRA_DEFINES += $$config.input.defines
export(EXTRA_DEFINES) export(EXTRA_DEFINES)
output += "EXTRA_DEFINES += $$config.input.defines" output += "EXTRA_DEFINES += $$val_escape(config.input.defines)"
} }
!isEmpty(config.input.includes) { !isEmpty(config.input.includes) {
EXTRA_INCLUDEPATH += $$config.input.includes EXTRA_INCLUDEPATH += $$config.input.includes
export(EXTRA_INCLUDEPATH) export(EXTRA_INCLUDEPATH)
output += "EXTRA_INCLUDEPATH += $$config.input.includes" output += "EXTRA_INCLUDEPATH += $$val_escape(config.input.includes)"
} }
!isEmpty(config.input.lpaths) { !isEmpty(config.input.lpaths) {
EXTRA_LIBDIR += $$config.input.lpaths EXTRA_LIBDIR += $$config.input.lpaths
export(EXTRA_LIBDIR) export(EXTRA_LIBDIR)
output += "EXTRA_LIBDIR += $$config.input.lpaths" output += "EXTRA_LIBDIR += $$val_escape(config.input.lpaths)"
} }
darwin:!isEmpty(config.input.fpaths) { darwin:!isEmpty(config.input.fpaths) {
EXTRA_FRAMEWORKPATH += $$config.input.fpaths EXTRA_FRAMEWORKPATH += $$config.input.fpaths
export(EXTRA_FRAMEWORKPATH) export(EXTRA_FRAMEWORKPATH)
output += "EXTRA_FRAMEWORKPATH += $$config.input.fpaths" output += "EXTRA_FRAMEWORKPATH += $$val_escape(config.input.fpaths)"
} }
config.output.privatePro += $$output config.output.privatePro += $$output

8
mkspecs/features/qt_configure.prf
View File

@ -415,13 +415,13 @@ defineTest(qtConfTest_compile) {
# add compiler flags, these are set for the target and should not be applied to host tests # add compiler flags, these are set for the target and should not be applied to host tests
!isEmpty(EXTRA_DEFINES): \ !isEmpty(EXTRA_DEFINES): \
qmake_args += "\"DEFINES += $$EXTRA_DEFINES\"" qmake_args += $$system_quote(DEFINES += $$val_escape(EXTRA_DEFINES))
!isEmpty(EXTRA_LIBDIR) \ !isEmpty(EXTRA_LIBDIR) \
qmake_args += "\"QMAKE_LIBDIR += $$EXTRA_LIBDIR\"" qmake_args += $$system_quote(QMAKE_LIBDIR += $$val_escape(EXTRA_LIBDIR))
!isEmpty(EXTRA_FRAMEWORKPATH) \ !isEmpty(EXTRA_FRAMEWORKPATH) \
qmake_args += "\"QMAKE_FRAMEWORKPATH += $$EXTRA_FRAMEWORKPATH\"" qmake_args += $$system_quote(QMAKE_FRAMEWORKPATH += $$val_escape(EXTRA_FRAMEWORKPATH))
!isEmpty(EXTRA_INCLUDEPATH): \ !isEmpty(EXTRA_INCLUDEPATH): \
qmake_args += "\"INCLUDEPATH += $$EXTRA_INCLUDEPATH\"" qmake_args += $$system_quote(INCLUDEPATH += $$val_escape(EXTRA_INCLUDEPATH))
qmake_args += $$EXTRA_QMAKE_ARGS qmake_args += $$EXTRA_QMAKE_ARGS
} }