Fixed tst_qobject signalbug silently not compiled in -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.

See also  e9015b3bc8.

Task-number: QTBUG-21168

Change-Id: I18fac1ac636fdc6b2aaee1b4cdfee9c4bc2a77ff
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-02-23 08:53:04 +01:00 committed by Qt by Nokia
parent 2b4e20ff17
commit 4a7be92f06
2 changed files with 8 additions and 6 deletions

View File

@ -1,4 +1,6 @@
TEMPLATE = subdirs
SUBDIRS = signalbug
tst_qobject.pro.depends = $$SUBDIRS
SUBDIRS += tst_qobject.pro
CONFIG += ordered
SUBDIRS += \
signalbug \
test

View File

@ -1,11 +1,11 @@
CONFIG += testcase console
TARGET = tst_qobject
TARGET = ../tst_qobject
QT = core-private network testlib
SOURCES = tst_qobject.cpp
SOURCES = ../tst_qobject.cpp
# this is here for a reason, moc_oldnormalizedobject.cpp is not auto-generated, it was generated by
# moc from Qt 4.6, and should *not* be generated by the current moc
SOURCES += moc_oldnormalizeobject.cpp
SOURCES += ../moc_oldnormalizeobject.cpp
load(testcase) # for target.path and installTestHelperApp()
installTestHelperApp("signalbug/signalbug",signalbug,signalbug)