diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-06-12 10:39:40 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-06-12 11:53:00 +0000 |
| commit | 5bfef74f12e59bfc699b7c8e93ea05c2625891d5 (patch) | |
| tree | 2d6e1a250309f7057861a6413798edde94e6fe8f | |
| parent | e8ba681ffdd56061f936014014214d42ff39adf4 (diff) | |
| download | qbs-5bfef74f12e59bfc699b7c8e93ea05c2625891d5.tar.gz | |
Fix race in qmake build
The five blackbox tests use the same Q_OBJECT header file and therefore
must not have a shared MOC_DIR. This fixed random build failures on
Windows.
Change-Id: Ia7bb4730c0b29c1de4c5f7373068f974ab67bf03
Reviewed-by: Christian Kandeler <christian.kandeler@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 b94f7dac9..6e4075175 100644 --- a/tests/auto/blackbox/blackbox-clangdb.pro +++ b/tests/auto/blackbox/blackbox-clangdb.pro @@ -3,6 +3,7 @@ TARGET = tst_blackbox-clangdb HEADERS = tst_blackboxbase.h tst_clangdb.h SOURCES = tst_blackboxbase.cpp tst_clangdb.cpp OBJECTS_DIR = clangdb +MOC_DIR = $${OBJECTS_DIR}-moc include(../auto.pri) diff --git a/tests/auto/blackbox/blackbox-java.pro b/tests/auto/blackbox/blackbox-java.pro index 692f859bf..d297d9e09 100644 --- a/tests/auto/blackbox/blackbox-java.pro +++ b/tests/auto/blackbox/blackbox-java.pro @@ -3,6 +3,7 @@ TARGET = tst_blackbox-java HEADERS = tst_blackboxjava.h tst_blackboxbase.h SOURCES = tst_blackboxjava.cpp tst_blackboxbase.cpp OBJECTS_DIR = java +MOC_DIR = $${OBJECTS_DIR}-moc include(../auto.pri) diff --git a/tests/auto/blackbox/blackbox.pro b/tests/auto/blackbox/blackbox.pro index 6309235b9..5e58e0e19 100644 --- a/tests/auto/blackbox/blackbox.pro +++ b/tests/auto/blackbox/blackbox.pro @@ -3,6 +3,7 @@ TARGET = tst_blackbox HEADERS = tst_blackbox.h tst_blackboxbase.h SOURCES = tst_blackbox.cpp tst_blackboxbase.cpp OBJECTS_DIR = generic +MOC_DIR = $${OBJECTS_DIR}-moc include(../auto.pri) |