qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix quoting in the basic qmake command construction 

... and refactor it to make it less scary.

note that "qmake_args" now basically means "qmake + args".

Change-Id: Ifa5b756642de95e2aadf01606d936ea1d7a18210
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-07-15 15:57:43 +02:00 committed by Lars Knoll
parent b093aec1d1
commit e23471abc0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mkspecs/features/qt_configure.prf
View File

@ -394,8 +394,12 @@ defineTest(qtConfTest_compile) {
test_dir = $$test_dir/$$eval($${1}.pro) test_dir = $$test_dir/$$eval($${1}.pro)
test_cmd_base = "cd $$system_quote($$system_path($$test_out_dir)) &&" test_cmd_base = "cd $$system_quote($$system_path($$test_out_dir)) &&"
qmake_args = $$qtConfPkgConfigEnv()$$system_quote($$system_path($$QMAKE_QMAKE))
!isEmpty(QMAKE_QTCONF): \
qmake_args += -qtconf $$system_quote($$QMAKE_QTCONF)
# Disable qmake features which are typically counterproductive for tests # Disable qmake features which are typically counterproductive for tests
qmake_args = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" qmake_args += "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
# allow tests to behave differently depending on the type of library # allow tests to behave differently depending on the type of library
# being built (shared/static). e.g. see config.tests/unix/icu # being built (shared/static). e.g. see config.tests/unix/icu
@ -445,12 +449,10 @@ defineTest(qtConfTest_compile) {
mkpath($$test_out_dir)|error() mkpath($$test_out_dir)|error()
!isEmpty(QMAKE_QTCONF): qtconfarg = -qtconf $$QMAKE_QTCONF
# add possible command line args # add possible command line args
qmake_args += $$qtConfPrepareArgs($$eval($${1}.args)) qmake_args += $$qtConfPrepareArgs($$eval($${1}.args))
qtRunLoggedCommand("$$test_cmd_base $$qtConfPkgConfigEnv()$$system_quote($$system_path($$QMAKE_QMAKE)) $$qtconfarg $$qmake_args $$shell_quote($$test_dir)") { qtRunLoggedCommand("$$test_cmd_base $$qmake_args $$system_quote($$test_dir)") {
qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE"): \ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE"): \
return(true) return(true)
} }