3 files changed, 12 insertions, 6 deletions
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/lib.pro b/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
index c44cd46597..2c3305e872 100644
--- a/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
+++ b/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
@@ -12,7 +12,7 @@ msvc: DEFINES += WIN32_MSVC
 target.path = $$[QT_INSTALL_TESTS]/tst_qlibrary
 INSTALLS += target
 
-win32 {
+win32:debug_and_release {
     CONFIG(debug, debug|release) {
         DESTDIR = ../debug/
     } else {
diff --git a/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
index bfda0e0194..3db4bed973 100644
--- a/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
+++ b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
@@ -13,12 +13,18 @@ msvc: DEFINES += WIN32_MSVC
 # We want to test if we can load a shared library with *any* filename...
 
 win32 {
-    CONFIG(debug, debug|release) {
-        BUILD_FOLDER = debug
+
+    debug_and_release {
+        CONFIG(debug, debug|release)) {
+            BUILD_FOLDER = debug
+        } else {
+            BUILD_FOLDER = release
+        }
+        DESTDIR = ../$$BUILD_FOLDER/
     } else {
-        BUILD_FOLDER = release
+        BUILD_FOLDER =
+        DESTDIR = ../
     }
-    DESTDIR = ../$$BUILD_FOLDER/
 
     # vcproj and Makefile generators refer to target differently
     contains(TEMPLATE,vc.*) {
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/tst.pro b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
index 56bef14405..5894bee9d5 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
+++ b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
@@ -3,7 +3,7 @@ TARGET = ../tst_qlibrary
 QT = core testlib
 SOURCES = ../tst_qlibrary.cpp
 
-win32 {
+win32:debug_and_release {
     CONFIG(debug, debug|release) {
         TARGET = ../../debug/tst_qlibrary
     } else {