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 14:35:34 +0000 |
| commit | 940ff23a8006a8e03fce75f4ea067f56ae02a19d (patch) | |
| tree | dcaf36d127a29711a3ada416d4eb5e8b4d3e8f09 /tests/auto/blackbox/blackbox-qt.pro | |
| parent | 902c7e315df1c47235481df4fee6c7fa01cfc2e6 (diff) | |
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.
This amends 5bfef74f from the 1.8 branch.
Change-Id: Ia7bb4730c0b29c1de4c5f7373068f974ab67bf03
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/blackbox-qt.pro')
| -rw-r--r-- | tests/auto/blackbox/blackbox-qt.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/blackbox/blackbox-qt.pro b/tests/auto/blackbox/blackbox-qt.pro index 1efa93340..e17a04a7e 100644 --- a/tests/auto/blackbox/blackbox-qt.pro +++ b/tests/auto/blackbox/blackbox-qt.pro @@ -3,6 +3,7 @@ TARGET = tst_blackbox-qt HEADERS = tst_blackboxqt.h tst_blackboxbase.h SOURCES = tst_blackboxqt.cpp tst_blackboxbase.cpp OBJECTS_DIR = qt +MOC_DIR = $${OBJECTS_DIR}-moc include(../auto.pri) |