diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-01-04 16:29:31 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-01-05 09:11:25 +0000 |
| commit | 0b6d23e67521e0d166704ce50ed26d340853db98 (patch) | |
| tree | 99d0af696e3f76e1a1a568073d40a11ba5d84d46 | |
| parent | 2bc9373d7b4bf54ecac4c9ea63453d549b2a0dad (diff) | |
Fix race condition in qmake build
Task-number: QBS-1091
Change-Id: I5cead5f3cd111ea66bec31a178f69c992a4024a1
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | tests/auto/blackbox/blackbox-clangdb.pro | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/blackbox-java.pro | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/blackbox.pro | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/blackbox/blackbox-clangdb.pro b/tests/auto/blackbox/blackbox-clangdb.pro index c4fcedbeb..b94f7dac9 100644 --- a/tests/auto/blackbox/blackbox-clangdb.pro +++ b/tests/auto/blackbox/blackbox-clangdb.pro @@ -2,6 +2,7 @@ TARGET = tst_blackbox-clangdb HEADERS = tst_blackboxbase.h tst_clangdb.h SOURCES = tst_blackboxbase.cpp tst_clangdb.cpp +OBJECTS_DIR = clangdb include(../auto.pri) diff --git a/tests/auto/blackbox/blackbox-java.pro b/tests/auto/blackbox/blackbox-java.pro index e3e60564e..692f859bf 100644 --- a/tests/auto/blackbox/blackbox-java.pro +++ b/tests/auto/blackbox/blackbox-java.pro @@ -2,6 +2,7 @@ TARGET = tst_blackbox-java HEADERS = tst_blackboxjava.h tst_blackboxbase.h SOURCES = tst_blackboxjava.cpp tst_blackboxbase.cpp +OBJECTS_DIR = java include(../auto.pri) diff --git a/tests/auto/blackbox/blackbox.pro b/tests/auto/blackbox/blackbox.pro index 8398270d6..711c79ca9 100644 --- a/tests/auto/blackbox/blackbox.pro +++ b/tests/auto/blackbox/blackbox.pro @@ -2,6 +2,7 @@ TARGET = tst_blackbox HEADERS = tst_blackbox.h tst_blackboxbase.h SOURCES = tst_blackbox.cpp tst_blackboxbase.cpp +OBJECTS_DIR = generic include(../auto.pri) |