summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-02-22 10:07:01 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-22 04:48:36 +0100
commite9015b3bc8827a8276f58bdd41adcac1bcbf2137 (patch)
tree978476fef1ac1173fc6792e453e1ed74a99f7aa3 /tests/auto/corelib
parentf3141c58badbd2da9eb42021e9704742c3e52a9b (diff)
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 <toby.tomkins@nokia.com>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/global/qlogging/qlogging.pro2
-rw-r--r--tests/auto/corelib/global/qlogging/test/test.pro4
-rw-r--r--tests/auto/corelib/global/qlogging/tst_qlogging.pro4
3 files changed, 5 insertions, 5 deletions
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