tst_qapplication: Fix execution for WinRT

Not putting executables into debug/release subdirectories leads to the
WinRT AppxManifest being overwritten by the wrong configuration. When Qt
is configured with -release for example, it was possible that the debug
manifest (Manifest files are always created next to the target) is
written last and thus contains debug VCLibs as a dependency.

Additionally the test was changed in that way, that the resulting file
system structure (having helper and test application in a "top level"
debug and release folder) is the same structure as in tst_qobject.

Change-Id: I017b501506c54c4b89773d2b949c097598bc7049
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 15 insertions, 4 deletions

diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro
index 832cfe7ebf..93e80dd123 100644
--- a/tests/auto/widgets/kernel/qapplication/test/test.pro
+++ b/tests/auto/widgets/kernel/qapplication/test/test.pro
@@ -1,11 +1,9 @@
 CONFIG += testcase
-CONFIG -= debug_and_release_target
 
 QT += widgets widgets-private testlib
 QT += core-private gui-private
 
 SOURCES += ../tst_qapplication.cpp
-TARGET = ../tst_qapplication
 
 builtin_testdata: DEFINES += BUILTIN_TESTDATA
 
@@ -14,7 +12,20 @@ TESTDATA = ../test/test.pro ../tmp/README ../modal
 !winrt {
   SUBPROGRAMS = desktopsettingsaware modal
   win32:SUBPROGRAMS += wincmdline
-
-  for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"
 }
 
+debug_and_release {
+    CONFIG(debug, debug|release) {
+        TARGET = ../../debug/tst_qapplication
+        !winrt: TEST_HELPER_INSTALLS = ../debug/helper
+        for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../debug/$${file}"
+    } else {
+        TARGET = ../../release/tst_qapplication
+        !winrt: TEST_HELPER_INSTALLS = ../release/helper
+        for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../release/$${file}"
+    }
+} else {
+    TARGET = ../tst_qapplication
+    !winrt: TEST_HELPER_INSTALLS = ../helper
+    for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}"
+}