From e9015b3bc8827a8276f58bdd41adcac1bcbf2137 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 22 Feb 2012 10:07:01 +1000 Subject: 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 --- tests/auto/corelib/global/qlogging/qlogging.pro | 2 +- tests/auto/corelib/global/qlogging/test/test.pro | 4 ++++ tests/auto/corelib/global/qlogging/tst_qlogging.pro | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 tests/auto/corelib/global/qlogging/test/test.pro delete mode 100644 tests/auto/corelib/global/qlogging/tst_qlogging.pro (limited to 'tests/auto/corelib/global/qlogging') diff --git a/tests/auto/corelib/global/qlogging/qlogging.pro b/tests/auto/corelib/global/qlogging/qlogging.pro index 1d5e7681df..4d3823cdbe 100644 --- a/tests/auto/corelib/global/qlogging/qlogging.pro +++ b/tests/auto/corelib/global/qlogging/qlogging.pro @@ -3,4 +3,4 @@ CONFIG += ordered SUBDIRS += \ app \ - tst_qlogging.pro + test diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro new file mode 100644 index 0000000000..6e4939ffc9 --- /dev/null +++ b/tests/auto/corelib/global/qlogging/test/test.pro @@ -0,0 +1,4 @@ +CONFIG += testcase parallel_test +TARGET = ../tst_qlogging +QT = core testlib +SOURCES = ../tst_qlogging.cpp diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.pro b/tests/auto/corelib/global/qlogging/tst_qlogging.pro deleted file mode 100644 index 60377e0fdc..0000000000 --- a/tests/auto/corelib/global/qlogging/tst_qlogging.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase parallel_test -TARGET = tst_qlogging -QT = core testlib -SOURCES = tst_qlogging.cpp -- cgit v1.2.3