Fixed several unit tests to work in shadow builds

- qlogging, qthreadstorage, qnetworkreply, qapplication, qfile, qprocess
  Added app_bundle and debug_and_release_target to CONFIG

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

diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro
index 6e9b86d..57e9ba3 100644 (file)
--- a/tests/auto/corelib/global/qlogging/test/test.pro
+++ b/tests/auto/corelib/global/qlogging/test/test.pro
@@ -1,4 +1,5 @@
 CONFIG += testcase parallel_test
+CONFIG -= app_bundle debug_and_release_target
 TARGET = ../tst_qlogging
 QT = core testlib
 SOURCES = ../tst_qlogging.cpp

diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro
index 39f47a0..dedf7f1 100644 (file)
--- a/tests/auto/corelib/io/qfile/test/test.pro
+++ b/tests/auto/corelib/io/qfile/test/test.pro
@@ -1,5 +1,6 @@
 CONFIG += testcase
 CONFIG += parallel_test
+CONFIG -= app_bundle debug_and_release_target
 QT = core-private core network testlib
 TARGET = ../tst_qfile
 SOURCES = ../tst_qfile.cpp

diff --git a/tests/auto/corelib/io/qprocess/test/test.pro b/tests/auto/corelib/io/qprocess/test/test.pro
index 6d5dd29..b3eeb59 100644 (file)
--- a/tests/auto/corelib/io/qprocess/test/test.pro
+++ b/tests/auto/corelib/io/qprocess/test/test.pro
@@ -1,5 +1,6 @@
 CONFIG += testcase
 CONFIG += parallel_test
+CONFIG -= app_bundle debug_and_release_target
 QT = core testlib network
 embedded: QT += gui
 SOURCES = ../tst_qprocess.cpp

diff --git a/tests/auto/corelib/thread/qthreadstorage/test/test.pro b/tests/auto/corelib/thread/qthreadstorage/test/test.pro
index cfbf5bf..0dc8656 100644 (file)
--- a/tests/auto/corelib/thread/qthreadstorage/test/test.pro
+++ b/tests/auto/corelib/thread/qthreadstorage/test/test.pro
@@ -1,6 +1,6 @@
 CONFIG += testcase
 TARGET = ../tst_qthreadstorage
-CONFIG -= app_bundle
+CONFIG -= app_bundle debug_and_release_target
 CONFIG += console
 QT = core testlib
 SOURCES = ../tst_qthreadstorage.cpp

diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro
index 302a603..2c43aa0 100644 (file)
--- a/tests/auto/network/access/qnetworkreply/test/test.pro
+++ b/tests/auto/network/access/qnetworkreply/test/test.pro
@@ -1,6 +1,7 @@
 CONFIG += testcase
 testcase.timeout = 600 # this test is slow
 CONFIG += parallel_test
+CONFIG -= app_bundle debug_and_release_target
 QT -= gui
 SOURCES  += ../tst_qnetworkreply.cpp
 TARGET = ../tst_qnetworkreply

diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro
index 97768ea..a10ff71 100644 (file)
--- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro
+++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro
@@ -1,5 +1,5 @@
 QT += widgets
-CONFIG -= app_bundle
+CONFIG -= app_bundle debug_and_release_target
 
 DESTDIR = ./
 

diff --git a/tests/auto/widgets/kernel/qapplication/modal/modal.pro b/tests/auto/widgets/kernel/qapplication/modal/modal.pro
index 05e5a7a..a34871d 100644 (file)
--- a/tests/auto/widgets/kernel/qapplication/modal/modal.pro
+++ b/tests/auto/widgets/kernel/qapplication/modal/modal.pro
@@ -2,6 +2,6 @@ QT += widgets
 SOURCES += main.cpp \
     base.cpp
 DESTDIR = ./
-CONFIG -= app_bundle
+CONFIG -= app_bundle debug_and_release_target
 HEADERS += base.h
 

diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro
index 61035cc..37af570 100644 (file)
--- a/tests/auto/widgets/kernel/qapplication/test/test.pro
+++ b/tests/auto/widgets/kernel/qapplication/test/test.pro
@@ -1,4 +1,5 @@
 CONFIG += testcase
+CONFIG -= app_bundle debug_and_release_target
 
 QT += widgets widgets-private testlib
 QT += core-private gui-private
@@ -6,14 +7,6 @@ QT += core-private gui-private
 SOURCES += ../tst_qapplication.cpp
 TARGET = ../tst_qapplication
 
-win32 {
-  CONFIG(debug, debug|release) {
-    TARGET = ../../debug/tst_qapplication
-} else {
-    TARGET = ../../release/tst_qapplication
-  }
-}
-
 TESTDATA = ../test/test.pro ../tmp/README
 
 SUBPROGRAMS = desktopsettingsaware modal

diff --git a/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro b/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro
index 3c3b2d0..3e32a67 100644 (file)
--- a/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro
+++ b/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro
@@ -1,4 +1,5 @@
 QT += widgets
+CONFIG -= app_bundle debug_and_release_target
 SOURCES += main.cpp
 DESTDIR = ./