diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-23 08:53:04 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-23 09:06:44 +0100 |
| commit | 4a7be92f06d81b93264e998d5f98480cf5bc58ba (patch) | |
| tree | c5754b2e983991d892f01c72f37b28f9ecf7d43d /tests/auto/corelib/kernel | |
| parent | 2b4e20ff17b56b1c590e9cc25393fa751d7fbce4 (diff) | |
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>
Diffstat (limited to 'tests/auto/corelib/kernel')
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/qobject.pro | 8 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/test/test.pro (renamed from tests/auto/corelib/kernel/qobject/tst_qobject.pro) | 6 |
2 files changed, 8 insertions, 6 deletions
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/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/test/test.pro index 30fd810a2e..9443b2e2c7 100644 --- 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) |