From 4a7be92f06d81b93264e998d5f98480cf5bc58ba Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 23 Feb 2012 08:53:04 +0100 Subject: 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 --- tests/auto/corelib/kernel/qobject/qobject.pro | 8 +++++--- tests/auto/corelib/kernel/qobject/test/test.pro | 11 +++++++++++ tests/auto/corelib/kernel/qobject/tst_qobject.pro | 11 ----------- 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 tests/auto/corelib/kernel/qobject/test/test.pro delete mode 100644 tests/auto/corelib/kernel/qobject/tst_qobject.pro diff --git a/tests/auto/corelib/kernel/qobject/qobject.pro b/tests/auto/corelib/kernel/qobject/qobject.pro index 0f86408fc9..6a7cf07f51 100644 --- 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/test/test.pro b/tests/auto/corelib/kernel/qobject/test/test.pro new file mode 100644 index 0000000000..9443b2e2c7 --- /dev/null +++ b/tests/auto/corelib/kernel/qobject/test/test.pro @@ -0,0 +1,11 @@ +CONFIG += testcase console +TARGET = ../tst_qobject +QT = core-private network testlib +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 + +load(testcase) # for target.path and installTestHelperApp() +installTestHelperApp("signalbug/signalbug",signalbug,signalbug) diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/tst_qobject.pro deleted file mode 100644 index 30fd810a2e..0000000000 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase console -TARGET = tst_qobject -QT = core-private network testlib -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 - -load(testcase) # for target.path and installTestHelperApp() -installTestHelperApp("signalbug/signalbug",signalbug,signalbug) -- cgit v1.2.3