6 files changed, 74 insertions, 8 deletions
diff --git a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
index 85483ec9dd..eaceac37b3 100644
--- a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
+++ b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qdbuscpp2xml
-    GUI
     SOURCES
         test1.h
         tst_qdbuscpp2xml.cpp
diff --git a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
index c6dbbcdc3a..8095421637 100644
--- a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
+++ b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
@@ -1 +1,10 @@
-add_qt_test(tst_qdbusxml2cpp SOURCES tst_qdbusxml2cpp.cpp)
+# Generated from qdbusxml2cpp.pro.
+
+#####################################################################
+## tst_qdbusxml2cpp Test:
+#####################################################################
+
+add_qt_test(tst_qdbusxml2cpp
+    SOURCES
+        tst_qdbusxml2cpp.cpp
+)
diff --git a/tests/auto/tools/qmake/.prev_CMakeLists.txt b/tests/auto/tools/qmake/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..4331d87d41
--- /dev/null
+++ b/tests/auto/tools/qmake/.prev_CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from qmake.pro.
+
+#####################################################################
+## tst_qmake Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    testdata/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qmake
+    SOURCES
+        testcompiler.cpp testcompiler.h
+        tst_qmake.cpp
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qmake.pro:WIN32:
+# testcase.timeout = "900"
+
+extend_target(tst_qmake CONDITION cross_compile
+    DEFINES
+        QMAKE_CROSS_COMPILED
+)
+
+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
+)
diff --git a/tests/auto/tools/qmake/CMakeLists.txt b/tests/auto/tools/qmake/CMakeLists.txt
index 23b81fe9f5..38de47f972 100644
--- a/tests/auto/tools/qmake/CMakeLists.txt
+++ b/tests/auto/tools/qmake/CMakeLists.txt
@@ -5,14 +5,12 @@
 #####################################################################
 
 # Collect test data
-
 file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "testdata/*")
+    testdata/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qmake
-    GUI
     SOURCES
         testcompiler.cpp testcompiler.h
         tst_qmake.cpp
@@ -25,7 +23,20 @@ add_qt_test(tst_qmake
 #### Keys ignored in scope 2:.:.:qmake.pro:WIN32:
 # testcase.timeout = "900"
 
-extend_target(tst_qmake CONDITION (CMAKE_CROSSCOMPILING) # special case
+extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING # special case
     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/qmakelib/CMakeLists.txt b/tests/auto/tools/qmakelib/CMakeLists.txt
index 4a07a2b477..1e56c81e77 100644
--- a/tests/auto/tools/qmakelib/CMakeLists.txt
+++ b/tests/auto/tools/qmakelib/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qmakelib
-    GUI
     SOURCES
         ../../../../qmake/library/ioutils.cpp
         ../../../../qmake/library/proitems.cpp
diff --git a/tests/auto/tools/uic/CMakeLists.txt b/tests/auto/tools/uic/CMakeLists.txt
index 22d43d9868..f7d91dccbe 100644
--- a/tests/auto/tools/uic/CMakeLists.txt
+++ b/tests/auto/tools/uic/CMakeLists.txt
@@ -1 +1,10 @@
-add_qt_test(tst_uic SOURCES tst_uic.cpp)
+# Generated from uic.pro.
+
+#####################################################################
+## tst_uic Test:
+#####################################################################
+
+add_qt_test(tst_uic
+    SOURCES
+        tst_uic.cpp
+)