4 files changed, 4 insertions, 30 deletions
diff --git a/tests/auto/tools/qmake/CMakeLists.txt b/tests/auto/tools/qmake/CMakeLists.txt
index 994d5d47d1..62db9257b8 100644
--- a/tests/auto/tools/qmake/CMakeLists.txt
+++ b/tests/auto/tools/qmake/CMakeLists.txt
@@ -27,16 +27,3 @@ extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING
     DEFINES
         QMAKE_CROSS_COMPILED
 )
-
-# special case begin
-# remove this because it's not needed
-#extend_target(tst_qmake CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release
-    #DEFINES
-        #DEBUG_BUILD
-#)
-
-#extend_target(tst_qmake CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
-    #DEFINES
-        #RELEASE_BUILD
-#)
-# special case end
diff --git a/tests/auto/tools/qmake/qmake.pro b/tests/auto/tools/qmake/qmake.pro
index ac52fb81fa..0e8ebcc7cc 100644
--- a/tests/auto/tools/qmake/qmake.pro
+++ b/tests/auto/tools/qmake/qmake.pro
@@ -7,11 +7,5 @@ SOURCES += tst_qmake.cpp testcompiler.cpp
 QT = core testlib
 
 cross_compile: DEFINES += QMAKE_CROSS_COMPILED
-debug_and_release {
-    CONFIG(debug, debug|release): \
-        DEFINES += DEBUG_BUILD
-    else: \
-        DEFINES += RELEASE_BUILD
-}
 
 TESTDATA += testdata/*
diff --git a/tests/auto/tools/qmake/testdata/resources/resources.pro b/tests/auto/tools/qmake/testdata/resources/resources.pro
index f024fe5617..8ced5048ae 100644
--- a/tests/auto/tools/qmake/testdata/resources/resources.pro
+++ b/tests/auto/tools/qmake/testdata/resources/resources.pro
@@ -1,4 +1,5 @@
 TEMPLATE = app
+CONFIG -= debug_and_release
 SOURCES = main.cpp
 
 pro_file.files = resources.pro
diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp
index 7f98a0f5a0..2b9ecddf2b 100644
--- a/tests/auto/tools/qmake/tst_qmake.cpp
+++ b/tests/auto/tools/qmake/tst_qmake.cpp
@@ -37,14 +37,6 @@
 #include <QStandardPaths>
 #include <QTemporaryDir>
 
-#if defined(DEBUG_BUILD)
-#  define DIR_INFIX "debug/"
-#elif defined(RELEASE_BUILD)
-#  define DIR_INFIX "release/"
-#else
-#  define DIR_INFIX ""
-#endif
-
 class tst_qmake : public QObject
 {
     Q_OBJECT
@@ -725,7 +717,7 @@ void tst_qmake::resources()
     QVERIFY(test_compiler.qmake(workDir, "resources"));
 
     {
-        QFile qrcFile(workDir + '/' + DIR_INFIX "qmake_pro_file.qrc");
+        QFile qrcFile(workDir + '/' + "qmake_pro_file.qrc");
         QVERIFY2(qrcFile.exists(), qPrintable(qrcFile.fileName()));
         QVERIFY(qrcFile.open(QFile::ReadOnly));
         QByteArray qrcXml = qrcFile.readAll();
@@ -734,7 +726,7 @@ void tst_qmake::resources()
     }
 
     {
-        QFile qrcFile(workDir + '/' + DIR_INFIX "qmake_subdir.qrc");
+        QFile qrcFile(workDir + '/' + "qmake_subdir.qrc");
         QVERIFY(qrcFile.exists());
         QVERIFY(qrcFile.open(QFile::ReadOnly));
         QByteArray qrcXml = qrcFile.readAll();
@@ -742,7 +734,7 @@ void tst_qmake::resources()
     }
 
     {
-        QFile qrcFile(workDir + '/' + DIR_INFIX "qmake_qmake_immediate.qrc");
+        QFile qrcFile(workDir + '/' + "qmake_qmake_immediate.qrc");
         QVERIFY(qrcFile.exists());
         QVERIFY(qrcFile.open(QFile::ReadOnly));
         QByteArray qrcXml = qrcFile.readAll();