Fixed tst_qlogging app silently not compiled in some -fast builds.
When configuring with -fast on Windows, a directory which contains two .pro files, one SUBDIRS and one not, will have the SUBDIRS Makefile silently clobbered by the non-SUBDIRS Makefile. In practice, this may cause various subdirectories to be silently excluded from the build. Rearrange .pro files for this test to avoid triggering this bug. Task-number: QTBUG-21168 Change-Id: Ic51941db497d7b8fb004f3c50f5ea24d90ff3114 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>bb10
parent
f3141c58ba
commit
e9015b3bc8
|
|
@ -3,4 +3,4 @@ CONFIG += ordered
|
|||
|
||||
SUBDIRS += \
|
||||
app \
|
||||
tst_qlogging.pro
|
||||
test
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
CONFIG += testcase parallel_test
|
||||
TARGET = ../tst_qlogging
|
||||
QT = core testlib
|
||||
SOURCES = ../tst_qlogging.cpp
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
CONFIG += testcase parallel_test
|
||||
TARGET = tst_qlogging
|
||||
QT = core testlib
|
||||
SOURCES = tst_qlogging.cpp
|
||||
Loading…
Reference in New Issue