diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-02 20:10:23 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-08 23:39:36 +0000 |
| commit | 9e579f64d7cb1bb6c185ff5555b3e4b4b2076dea (patch) | |
| tree | 151b41e35a4000010035ac7ab18c04bc1dfe0831 /mkspecs/features/qt_configure.prf | |
| parent | 5152c3ca82a0f47273e3bfc59a5a29e0503ed7dd (diff) | |
don't litter configure test build dirs with .qmake.cache files
there should be only one, at the level of the isolating .qmake.conf.
Change-Id: I25f05864d6f5c1bb5caf2fb4138adb4bb9cc2f22
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/features/qt_configure.prf')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 81c63205a7..2732d2ad0f 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)) &&" @@ -775,7 +776,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) |