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  e9015b3bc8827a8276f58bdd41adcac1bcbf2137.

Task-number: QTBUG-21168

Change-Id: I18fac1ac636fdc6b2aaee1b4cdfee9c4bc2a77ff
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/tests/auto/corelib/kernel/qobject/qobject.pro b/tests/auto/corelib/kernel/qobject/qobject.pro
index 0f86408..6a7cf07 100644 (file)
--- a/tests/auto/corelib/kernel/qobject/qobject.pro
+++ b/tests/auto/corelib/kernel/qobject/qobject.pro
@@ -1,4 +1,6 @@
 TEMPLATE = subdirs
-SUBDIRS = signalbug
-tst_qobject.pro.depends = $$SUBDIRS
-SUBDIRS += tst_qobject.pro
+CONFIG += ordered
+
+SUBDIRS += \
+    signalbug \
+    test

diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/test/test.pro
similarity index 79%
rename from tests/auto/corelib/kernel/qobject/tst_qobject.pro
rename to tests/auto/corelib/kernel/qobject/test/test.pro
index 30fd810..9443b2e 100644 (file)
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.pro
+++ b/tests/auto/corelib/kernel/qobject/test/test.pro
@@ -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)