diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-19 13:25:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-19 16:12:34 +0200 |
| commit | ce09ef431373f45d14ce0a6e7de24aee3666093d (patch) | |
| tree | 7c998b21f02db55e233e7eeb1599663f1c6b51ca /mkspecs/features/qt_configure.prf | |
| parent | 7ad55ca65f42351e231f31f7a9253ae6eaf1ebb3 (diff) | |
| parent | 97eec16e4ff6367c233f8ea6c4a343c286c3a514 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/plugins/platforms/android/qandroidplatformintegration.h
src/plugins/platforms/windows/qwindowscontext.cpp
src/plugins/platforms/windows/windows.pri
src/tools/uic/cpp/cppwriteinitialization.cpp
src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
Diffstat (limited to 'mkspecs/features/qt_configure.prf')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 964c2393c2..f3db6b467d 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -326,7 +326,7 @@ defineTest(qtConfParseCommandLine) { } defineReplace(qtConfToolchainSupportsFlag) { - test_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR) + test_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR) test_cmd_base = "$$QMAKE_CD $$system_quote($$system_path($$test_out_dir)) &&" conftest = "int main() { return 0; }" @@ -849,7 +849,7 @@ defineTest(qtConfTest_compile) { isEmpty(host): host = false test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$test - test_base_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR) + test_base_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR) test_out_dir = $$test_base_out_dir/$$test !isEmpty($${1}.pro): \ test_dir = $$test_dir/$$eval($${1}.pro) |