diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-14 11:33:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-14 11:33:02 +0100 |
| commit | 27432d40f2500b11780398f6c7d67719050dae6c (patch) | |
| tree | 97f9a60af2d520d66fa7ff802ccddad56e0cadaf /mkspecs/features | |
| parent | 071a120400b17eaa0b414a0ed262b0a090908679 (diff) | |
| parent | 10ecbc4041cb7db004f4ed4d40ce082553d75844 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I2bd2e61bae1eab4fc74fa6accd741ed9ae1f0669
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/moc.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 119dc53d20..9719241612 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -57,7 +57,7 @@ defineReplace(mocCmdBase) { msvc: RET += --compiler-flavor=msvc isEmpty(MOC_PREDEF_FILE): RET += $$join(QMAKE_COMPILER_DEFINES, " -D", -D) - else: RET += --include $$moc_predefs.output + else: RET += --include $$shell_quote($$moc_predefs.output) RET += $$incvar $$QMAKE_MOC_OPTIONS return($$RET) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 761b037e22..78731595b0 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -718,7 +718,8 @@ defineTest(qtConfTest_compile) { isEmpty(host): host = false test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$test - test_out_dir = $$shadowed($$test_dir) + test_base_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR) + test_out_dir = $$test_base_out_dir/$$test !isEmpty($${1}.pro): \ test_dir = $$test_dir/$$eval($${1}.pro) test_cmd_base = "$$QMAKE_CD $$system_quote($$system_path($$test_out_dir)) &&" @@ -779,7 +780,7 @@ defineTest(qtConfTest_compile) { QMAKE_MAKE = "$$QMAKE_MAKE clean && $$QMAKE_MAKE" mkpath($$test_out_dir)|error() - write_file($$test_out_dir/.qmake.cache)|error() + write_file($$test_base_out_dir/.qmake.cache)|error() # add possible command line args qmake_args += $$qtConfPrepareArgs($$eval($${1}.args)) $$eval($${1}.literal_args) |