Regenerate remaining tests to be in sync

Change-Id: I200c8f58ad13bc1bc78409a3ce49348584ba5b51
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

21 files changed, 260 insertions, 196 deletions

diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt
index bbd01613c7..13d2d9e189 100644
--- a/tests/manual/highdpi/CMakeLists.txt
+++ b/tests/manual/highdpi/CMakeLists.txt
@@ -1,10 +1,12 @@
 # Generated from highdpi.pro.
 
 #####################################################################
-## qmlimageproviderplugin Plugin:
+## qmlimageproviderplugin Generic Library:
 #####################################################################
 
-add_qt_plugin(qmlimageproviderplugin
+add_cmake_library(qmlimageproviderplugin
+    MODULE
+    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/quick/imageprovider/ImageProvider"
     OUTPUT_DIRECTORY "ImageProvider"
     SOURCES
         imageprovider.cpp
@@ -16,9 +18,10 @@ add_qt_plugin(qmlimageproviderplugin
 )
 
 #### Keys ignored in scope 1:.:.:highdpi.pro:<TRUE>:
-# CONFIG = "plugin"
 # INSTALLS = "target" "qml"
 # TEMPLATE = "lib"
 # qml.files = "ImageProvider/qmldir"
 # qml.path = "$$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider"
 # target.path = "$$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider"
+
+qt_autogen_tools_initial_setup(qmlimageproviderplugin)
diff --git a/tests/manual/httpserver/CMakeLists.txt b/tests/manual/httpserver/CMakeLists.txt
index 61707e145d..7bd972d492 100644
--- a/tests/manual/httpserver/CMakeLists.txt
+++ b/tests/manual/httpserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## httpserver Binary:
 #####################################################################
 
-add_qt_executable(httpserver
+add_qt_manual_test(httpserver
     SOURCES
         ../../auto/shared/testhttpserver.cpp ../../auto/shared/testhttpserver.h
         main.cpp
@@ -15,5 +15,4 @@ add_qt_executable(httpserver
 )
 
 #### Keys ignored in scope 1:.:.:httpserver.pro:<TRUE>:
-# CONFIG = "console" "-app_bundle"
 # TEMPLATE = "app"
diff --git a/tests/manual/mousearea/CMakeLists.txt b/tests/manual/mousearea/CMakeLists.txt
index 631351d035..ca676bc542 100644
--- a/tests/manual/mousearea/CMakeLists.txt
+++ b/tests/manual/mousearea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mousearea Binary:
 #####################################################################
 
-add_qt_executable(mousearea
+add_qt_manual_test(mousearea
     GUI
     SOURCES
         main.cpp
@@ -15,12 +15,16 @@ add_qt_executable(mousearea
 )
 
 # Resources:
+set(qml_resource_files
+    "main.qml"
+    "plainMouseArea.qml"
+)
+
 add_qt_resource(mousearea "qml"
     PREFIX
         "/"
     FILES
-        main.qml
-        plainMouseArea.qml
+        ${qml_resource_files}
 )
 set_source_files_properties("../../../examples/quick/shared/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
@@ -55,23 +59,27 @@ set_source_files_properties("../../../examples/quick/shared/images/next.png"
 set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
     PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
 )
+set(quick_shared_resource_files
+    "Button.qml"
+    "CheckBox.qml"
+    "Label.qml"
+    "LauncherList.qml"
+    "SimpleLauncherDelegate.qml"
+    "Slider.qml"
+    "TextField.qml"
+    "images/back.png"
+    "images/checkmark.png"
+    "images/next.png"
+    "images/slider_handle.png"
+)
+
 add_qt_resource(mousearea "quick_shared"
     PREFIX
         "/quick/shared"
     BASE
         "../../../examples/quick/shared"
     FILES
-        Button.qml
-        CheckBox.qml
-        Label.qml
-        LauncherList.qml
-        SimpleLauncherDelegate.qml
-        Slider.qml
-        TextField.qml
-        images/back.png
-        images/checkmark.png
-        images/next.png
-        images/slider_handle.png
+        ${quick_shared_resource_files}
 )
 
 
diff --git a/tests/manual/nodetypes/CMakeLists.txt b/tests/manual/nodetypes/CMakeLists.txt
index 24a4c43b03..1873120aac 100644
--- a/tests/manual/nodetypes/CMakeLists.txt
+++ b/tests/manual/nodetypes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nodetypes Binary:
 #####################################################################
 
-add_qt_executable(nodetypes
+add_qt_manual_test(nodetypes
     GUI
     SOURCES
         nodetypes.cpp
@@ -15,27 +15,31 @@ add_qt_executable(nodetypes
 )
 
 # Resources:
+set(nodetypes_resource_files
+    "Animators.qml"
+    "Effects.qml"
+    "Images.qml"
+    "Layers.qml"
+    "LotsOfImages.qml"
+    "LotsOfRects.qml"
+    "Painter.qml"
+    "Rects.qml"
+    "Text.qml"
+    "face-smile.png"
+    "main.qml"
+    "ps_shadow1.cso"
+    "ps_shadow2.cso"
+    "ps_wobble.cso"
+    "qt.png"
+    "shadow.png"
+    "vs_wobble.cso"
+)
+
 add_qt_resource(nodetypes "nodetypes"
     PREFIX
         "/"
     FILES
-        Animators.qml
-        Effects.qml
-        Images.qml
-        Layers.qml
-        LotsOfImages.qml
-        LotsOfRects.qml
-        Painter.qml
-        Rects.qml
-        Text.qml
-        face-smile.png
-        main.qml
-        ps_shadow1.cso
-        ps_shadow2.cso
-        ps_wobble.cso
-        qt.png
-        shadow.png
-        vs_wobble.cso
+        ${nodetypes_resource_files}
 )
 
 
diff --git a/tests/manual/nodetypes_ng/CMakeLists.txt b/tests/manual/nodetypes_ng/CMakeLists.txt
index 8666cd15bc..81908c69db 100644
--- a/tests/manual/nodetypes_ng/CMakeLists.txt
+++ b/tests/manual/nodetypes_ng/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nodetypes_ng Binary:
 #####################################################################
 
-add_qt_executable(nodetypes_ng
+add_qt_manual_test(nodetypes_ng
     GUI
     SOURCES
         nodetypes_ng.cpp
@@ -15,44 +15,48 @@ add_qt_executable(nodetypes_ng
 )
 
 # Resources:
+set(nodetypes_ng_resource_files
+    "AtlasedImages.qml"
+    "CompressedImages.qml"
+    "DistanceFieldText.qml"
+    "Images.qml"
+    "Layers.qml"
+    "LotsOfNodes.qml"
+    "LotsOfRects.qml"
+    "MoreWindows.qml"
+    "MultiClipRects.qml"
+    "Painter.qml"
+    "Rects.qml"
+    "ShaderEffect.qml"
+    "ShaderEffectNoAnim.qml"
+    "ShaderEffectSource.qml"
+    "SimpleRect.qml"
+    "Text.qml"
+    "arrow-down.png"
+    "arrow-up.png"
+    "blacknwhite.png"
+    "car_etc2_nomips.ktx"
+    "face-smile.png"
+    "main.qml"
+    "minus-sign.png"
+    "plus-sign.png"
+    "qt.png"
+    "qt_bc1_10mips.ktx"
+    "shadow_pass1.frag.qsb"
+    "shadow_pass1_legacy_gl.frag"
+    "shadow_pass2.frag.qsb"
+    "shadow_pass2_legacy_gl.frag"
+    "wobble.frag.qsb"
+    "wobble.vert.qsb"
+    "wobble_legacy_gl.frag"
+    "wobble_legacy_gl.vert"
+)
+
 add_qt_resource(nodetypes_ng "nodetypes_ng"
     PREFIX
         "/"
     FILES
-        AtlasedImages.qml
-        CompressedImages.qml
-        DistanceFieldText.qml
-        Images.qml
-        Layers.qml
-        LotsOfNodes.qml
-        LotsOfRects.qml
-        MoreWindows.qml
-        MultiClipRects.qml
-        Painter.qml
-        Rects.qml
-        ShaderEffect.qml
-        ShaderEffectNoAnim.qml
-        ShaderEffectSource.qml
-        SimpleRect.qml
-        Text.qml
-        arrow-down.png
-        arrow-up.png
-        blacknwhite.png
-        car_etc2_nomips.ktx
-        face-smile.png
-        main.qml
-        minus-sign.png
-        plus-sign.png
-        qt.png
-        qt_bc1_10mips.ktx
-        shadow_pass1.frag.qsb
-        shadow_pass1_legacy_gl.frag
-        shadow_pass2.frag.qsb
-        shadow_pass2_legacy_gl.frag
-        wobble.frag.qsb
-        wobble.vert.qsb
-        wobble_legacy_gl.frag
-        wobble_legacy_gl.vert
+        ${nodetypes_ng_resource_files}
 )
 
 
diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt
index fef6bdafc1..1c70e03f62 100644
--- a/tests/manual/pointer/CMakeLists.txt
+++ b/tests/manual/pointer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pointer Binary:
 #####################################################################
 
-add_qt_executable(pointer
+add_qt_manual_test(pointer
     GUI
     SOURCES
         inputinspector.cpp inputinspector.h
@@ -19,53 +19,57 @@ add_qt_executable(pointer
 )
 
 # Resources:
+set(qml_resource_files
+    "content/CheckBox.qml"
+    "content/FakeFlickable.qml"
+    "content/FlashAnimation.qml"
+    "content/MomentumAnimation.qml"
+    "content/MouseAreaButton.qml"
+    "content/MouseAreaSlider.qml"
+    "content/MouseFeedbackSprite.qml"
+    "content/MptaButton.qml"
+    "content/MultiButton.qml"
+    "content/ScrollBar.qml"
+    "content/Slider.qml"
+    "content/TapHandlerButton.qml"
+    "content/TextBox.qml"
+    "content/TouchpointFeedbackSprite.qml"
+    "fakeFlickable.qml"
+    "flickableWithHandlers.qml"
+    "flingAnimation.qml"
+    "joystick.qml"
+    "main.qml"
+    "map.qml"
+    "map2.qml"
+    "mixer.qml"
+    "multibuttons.qml"
+    "photosurface.qml"
+    "pinchHandler.qml"
+    "pointerDrag.qml"
+    "resources/arrowhead.png"
+    "resources/balloon.png"
+    "resources/fighter.png"
+    "resources/fingersprite.png"
+    "resources/grabbing-location.svg"
+    "resources/joystick-outer-case-pov.jpg"
+    "resources/map.svgz"
+    "resources/missile.png"
+    "resources/mixer-knob.png"
+    "resources/mouse.png"
+    "resources/mouse_left.png"
+    "resources/mouse_middle.png"
+    "resources/mouse_right.png"
+    "resources/redball.png"
+    "sidebar.qml"
+    "singlePointHandlerProperties.qml"
+    "tapHandler.qml"
+)
+
 add_qt_resource(pointer "qml"
     PREFIX
         "/"
     FILES
-        content/CheckBox.qml
-        content/FakeFlickable.qml
-        content/FlashAnimation.qml
-        content/MomentumAnimation.qml
-        content/MouseAreaButton.qml
-        content/MouseAreaSlider.qml
-        content/MouseFeedbackSprite.qml
-        content/MptaButton.qml
-        content/MultiButton.qml
-        content/ScrollBar.qml
-        content/Slider.qml
-        content/TapHandlerButton.qml
-        content/TextBox.qml
-        content/TouchpointFeedbackSprite.qml
-        fakeFlickable.qml
-        flickableWithHandlers.qml
-        flingAnimation.qml
-        joystick.qml
-        main.qml
-        map.qml
-        map2.qml
-        mixer.qml
-        multibuttons.qml
-        photosurface.qml
-        pinchHandler.qml
-        pointerDrag.qml
-        resources/arrowhead.png
-        resources/balloon.png
-        resources/fighter.png
-        resources/fingersprite.png
-        resources/grabbing-location.svg
-        resources/joystick-outer-case-pov.jpg
-        resources/map.svgz
-        resources/missile.png
-        resources/mixer-knob.png
-        resources/mouse.png
-        resources/mouse_left.png
-        resources/mouse_middle.png
-        resources/mouse_right.png
-        resources/redball.png
-        sidebar.qml
-        singlePointHandlerProperties.qml
-        tapHandler.qml
+        ${qml_resource_files}
 )
 set_source_files_properties("../../../examples/quick/shared/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
@@ -100,23 +104,27 @@ set_source_files_properties("../../../examples/quick/shared/images/next.png"
 set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
     PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
 )
+set(quick_shared_resource_files
+    "Button.qml"
+    "CheckBox.qml"
+    "Label.qml"
+    "LauncherList.qml"
+    "SimpleLauncherDelegate.qml"
+    "Slider.qml"
+    "TextField.qml"
+    "images/back.png"
+    "images/checkmark.png"
+    "images/next.png"
+    "images/slider_handle.png"
+)
+
 add_qt_resource(pointer "quick_shared"
     PREFIX
         "/quick/shared"
     BASE
         "../../../examples/quick/shared"
     FILES
-        Button.qml
-        CheckBox.qml
-        Label.qml
-        LauncherList.qml
-        SimpleLauncherDelegate.qml
-        Slider.qml
-        TextField.qml
-        images/back.png
-        images/checkmark.png
-        images/next.png
-        images/slider_handle.png
+        ${quick_shared_resource_files}
 )
 
 
diff --git a/tests/manual/qmltypememory/CMakeLists.txt b/tests/manual/qmltypememory/CMakeLists.txt
index 4409e4e0e5..faf21c7b13 100644
--- a/tests/manual/qmltypememory/CMakeLists.txt
+++ b/tests/manual/qmltypememory/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmltypememory Binary:
 #####################################################################
 
-add_qt_executable(qmltypememory
+add_qt_manual_test(qmltypememory
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt b/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt
index f890e46c4e..3c24c3eed8 100644
--- a/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt
+++ b/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Generated from plugin.pro.
 
 #####################################################################
-## testplugin Plugin:
+## testplugin Generic Library:
 #####################################################################
 
-add_qt_plugin(testplugin
+add_cmake_library(testplugin
+    MODULE
     SOURCES
         plugin.cpp
     PUBLIC_LIBRARIES
@@ -14,5 +15,6 @@ add_qt_plugin(testplugin
 )
 
 #### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# CONFIG = "plugin"
 # TEMPLATE = "lib"
+
+qt_autogen_tools_initial_setup(testplugin)
diff --git a/tests/manual/quickwidgetviewer/CMakeLists.txt b/tests/manual/quickwidgetviewer/CMakeLists.txt
index 19c71890cd..7e53a4cd49 100644
--- a/tests/manual/quickwidgetviewer/CMakeLists.txt
+++ b/tests/manual/quickwidgetviewer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## quickwidgetviewer Binary:
 #####################################################################
 
-add_qt_executable(quickwidgetviewer
+add_qt_manual_test(quickwidgetviewer
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
@@ -13,5 +13,4 @@ add_qt_executable(quickwidgetviewer
 )
 
 #### Keys ignored in scope 1:.:.:quickwidgetviewer.pro:<TRUE>:
-# CONFIG = "c++11" "console"
 # TEMPLATE = "app"
diff --git a/tests/manual/scalablepath/CMakeLists.txt b/tests/manual/scalablepath/CMakeLists.txt
index 9eb2d0cc53..bf82a450ec 100644
--- a/tests/manual/scalablepath/CMakeLists.txt
+++ b/tests/manual/scalablepath/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## scalablepath Binary:
 #####################################################################
 
-add_qt_executable(scalablepath
+add_qt_manual_test(scalablepath
     GUI
     SOURCES
         main.cpp
@@ -15,15 +15,18 @@ add_qt_executable(scalablepath
 )
 
 # Resources:
+set(qml_resource_files
+    "ShapeTestScale.qml"
+    "main.qml"
+)
+
 add_qt_resource(scalablepath "qml"
     PREFIX
         "/"
     FILES
-        ShapeTestScale.qml
-        main.qml
+        ${qml_resource_files}
 )
 
 
 #### Keys ignored in scope 1:.:.:scalablepath.pro:<TRUE>:
-# CONFIG = "c++11"
 # TEMPLATE = "app"
diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
index a237418657..9cf03d738a 100644
--- a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
+++ b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlscenegrabber Binary:
 #####################################################################
 
-add_qt_executable(qmlscenegrabber
+add_qt_manual_test(qmlscenegrabber
     OUTPUT_DIRECTORY ".."
     SOURCES
         main.cpp
@@ -13,11 +13,5 @@ add_qt_executable(qmlscenegrabber
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:scenegrabber.pro:<TRUE>:
-# CONFIG = "console"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:scenegrabber.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt
index 6f10497ace..3e5dca6d0a 100644
--- a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt
+++ b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt
@@ -4,6 +4,9 @@
 ## tst_scenegraph Test:
 #####################################################################
 
+# Collect test data
+list(APPEND test_data "../data")
+
 add_qt_test(tst_scenegraph
     OUTPUT_DIRECTORY ".."
     SOURCES
@@ -18,19 +21,17 @@ add_qt_test(tst_scenegraph
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Network
+    TESTDATA ${test_data}
 )
 
 #### Keys ignored in scope 1:.:.:scenegraph.pro:<TRUE>:
-# CONFIG = "testcase" "console"
+# TEST_HELPER_INSTALLS = ".././qmlscenegrabber"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:scenegraph.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 #### Keys ignored in scope 4:.:../../../../../qtbase/tests/baselineserver/shared:../../../../../qtbase/tests/baselineserver/shared/qbaselinetest.pri:WIN32:
-# MKSPEC = "$$replaceQMAKESPEC,\\\\,/"
+# MKSPEC = "$$replace(QMAKESPEC, \\\\, /)"
 
 #### Keys ignored in scope 5:.:../../../../../qtbase/tests/baselineserver/shared:../../../../../qtbase/tests/baselineserver/shared/qbaselinetest.pri:else:
 # MKSPEC = "$$QMAKESPEC"
diff --git a/tests/manual/shapestest/CMakeLists.txt b/tests/manual/shapestest/CMakeLists.txt
index 587f1c596b..e93e16a8ef 100644
--- a/tests/manual/shapestest/CMakeLists.txt
+++ b/tests/manual/shapestest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## shapestest Binary:
 #####################################################################
 
-add_qt_executable(shapestest
+add_qt_manual_test(shapestest
     GUI
     SOURCES
         main.cpp
@@ -15,11 +15,15 @@ add_qt_executable(shapestest
 )
 
 # Resources:
+set(shapestest_resource_files
+    "shapestest.qml"
+)
+
 add_qt_resource(shapestest "shapestest"
     PREFIX
         "/shapestest"
     FILES
-        shapestest.qml
+        ${shapestest_resource_files}
 )
 
 
diff --git a/tests/manual/tableview/abstracttablemodel/CMakeLists.txt b/tests/manual/tableview/abstracttablemodel/CMakeLists.txt
index 2e0f5b2d1b..a7137c0ae8 100644
--- a/tests/manual/tableview/abstracttablemodel/CMakeLists.txt
+++ b/tests/manual/tableview/abstracttablemodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tableview_abstracttablemodel Binary:
 #####################################################################
 
-add_qt_executable(tableview_abstracttablemodel
+add_qt_manual_test(tableview_abstracttablemodel
     GUI
     SOURCES
         main.cpp
@@ -15,12 +15,16 @@ add_qt_executable(tableview_abstracttablemodel
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "Button.qml"
+    "main.qml"
+)
+
 add_qt_resource(tableview_abstracttablemodel "qmake_immediate"
     PREFIX
         "/"
     FILES
-        Button.qml
-        main.qml
+        ${qmake_immediate_resource_files}
 )
 
 
diff --git a/tests/manual/tableview/listmodel/CMakeLists.txt b/tests/manual/tableview/listmodel/CMakeLists.txt
index bca3bb06b5..bd9297a259 100644
--- a/tests/manual/tableview/listmodel/CMakeLists.txt
+++ b/tests/manual/tableview/listmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tableview_listmodel Binary:
 #####################################################################
 
-add_qt_executable(tableview_listmodel
+add_qt_manual_test(tableview_listmodel
     GUI
     SOURCES
         main.cpp
@@ -15,11 +15,15 @@ add_qt_executable(tableview_listmodel
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "main.qml"
+)
+
 add_qt_resource(tableview_listmodel "qmake_immediate"
     PREFIX
         "/"
     FILES
-        main.qml
+        ${qmake_immediate_resource_files}
 )
 
 
diff --git a/tests/manual/tableview/storagemodel/CMakeLists.txt b/tests/manual/tableview/storagemodel/CMakeLists.txt
index 363c2cf8ba..f920fb28d4 100644
--- a/tests/manual/tableview/storagemodel/CMakeLists.txt
+++ b/tests/manual/tableview/storagemodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tableview_storage Binary:
 #####################################################################
 
-add_qt_executable(tableview_storage
+add_qt_manual_test(tableview_storage
     GUI
     SOURCES
         main.cpp
@@ -16,11 +16,15 @@ add_qt_executable(tableview_storage
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "main.qml"
+)
+
 add_qt_resource(tableview_storage "qmake_immediate"
     PREFIX
         "/"
     FILES
-        main.qml
+        ${qmake_immediate_resource_files}
 )
 
 
diff --git a/tests/manual/tableview/tablemodel/form/CMakeLists.txt b/tests/manual/tableview/tablemodel/form/CMakeLists.txt
index 5de4ae68b7..2e2af0bbb1 100644
--- a/tests/manual/tableview/tablemodel/form/CMakeLists.txt
+++ b/tests/manual/tableview/tablemodel/form/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## form Binary:
 #####################################################################
 
-add_qt_executable(form
+add_qt_manual_test(form
     GUI
     SOURCES
         main.cpp
@@ -15,12 +15,16 @@ add_qt_executable(form
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "RowForm.qml"
+    "main.qml"
+)
+
 add_qt_resource(form "qmake_immediate"
     PREFIX
         "/"
     FILES
-        RowForm.qml
-        main.qml
+        ${qmake_immediate_resource_files}
 )
 
 
diff --git a/tests/manual/tableview/tablemodel/json/CMakeLists.txt b/tests/manual/tableview/tablemodel/json/CMakeLists.txt
index eeff661a0c..c0b68b2eb6 100644
--- a/tests/manual/tableview/tablemodel/json/CMakeLists.txt
+++ b/tests/manual/tableview/tablemodel/json/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## json Binary:
 #####################################################################
 
-add_qt_executable(json
+add_qt_manual_test(json
     GUI
     SOURCES
         main.cpp
@@ -15,12 +15,16 @@ add_qt_executable(json
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "JsonData.js"
+    "main.qml"
+)
+
 add_qt_resource(json "qmake_immediate"
     PREFIX
         "/"
     FILES
-        JsonData.js
-        main.qml
+        ${qmake_immediate_resource_files}
 )
 
 
diff --git a/tests/manual/text/CMakeLists.txt b/tests/manual/text/CMakeLists.txt
index e083a37f4b..69524f4154 100644
--- a/tests/manual/text/CMakeLists.txt
+++ b/tests/manual/text/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## text Binary:
 #####################################################################
 
-add_qt_executable(text
+add_qt_manual_test(text
     GUI
     SOURCES
         main.cpp
@@ -15,13 +15,17 @@ add_qt_executable(text
 )
 
 # Resources:
+set(qml_resource_files
+    "SignalIndicator.qml"
+    "main.qml"
+    "textInputPropertiesAndSignals.qml"
+)
+
 add_qt_resource(text "qml"
     PREFIX
         "/"
     FILES
-        SignalIndicator.qml
-        main.qml
-        textInputPropertiesAndSignals.qml
+        ${qml_resource_files}
 )
 set_source_files_properties("../../../examples/quick/shared/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
@@ -56,23 +60,27 @@ set_source_files_properties("../../../examples/quick/shared/images/next.png"
 set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
     PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
 )
+set(quick_shared_resource_files
+    "Button.qml"
+    "CheckBox.qml"
+    "Label.qml"
+    "LauncherList.qml"
+    "SimpleLauncherDelegate.qml"
+    "Slider.qml"
+    "TextField.qml"
+    "images/back.png"
+    "images/checkmark.png"
+    "images/next.png"
+    "images/slider_handle.png"
+)
+
 add_qt_resource(text "quick_shared"
     PREFIX
         "/quick/shared"
     BASE
         "../../../examples/quick/shared"
     FILES
-        Button.qml
-        CheckBox.qml
-        Label.qml
-        LauncherList.qml
-        SimpleLauncherDelegate.qml
-        Slider.qml
-        TextField.qml
-        images/back.png
-        images/checkmark.png
-        images/next.png
-        images/slider_handle.png
+        ${quick_shared_resource_files}
 )
 
 
diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt
index 040ac91607..d3d7a1e749 100644
--- a/tests/manual/touch/CMakeLists.txt
+++ b/tests/manual/touch/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## touch Binary:
 #####################################################################
 
-add_qt_executable(touch
+add_qt_manual_test(touch
     GUI
     SOURCES
         main.cpp
@@ -15,13 +15,17 @@ add_qt_executable(touch
 )
 
 # Resources:
+set(qml_resource_files
+    "flicktext.qml"
+    "main.qml"
+    "mpta-crosshairs.qml"
+)
+
 add_qt_resource(touch "qml"
     PREFIX
         "/"
     FILES
-        flicktext.qml
-        main.qml
-        mpta-crosshairs.qml
+        ${qml_resource_files}
 )
 set_source_files_properties("../../../examples/quick/shared/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
@@ -56,23 +60,27 @@ set_source_files_properties("../../../examples/quick/shared/images/next.png"
 set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
     PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
 )
+set(quick_shared_resource_files
+    "Button.qml"
+    "CheckBox.qml"
+    "Label.qml"
+    "LauncherList.qml"
+    "SimpleLauncherDelegate.qml"
+    "Slider.qml"
+    "TextField.qml"
+    "images/back.png"
+    "images/checkmark.png"
+    "images/next.png"
+    "images/slider_handle.png"
+)
+
 add_qt_resource(touch "quick_shared"
     PREFIX
         "/quick/shared"
     BASE
         "../../../examples/quick/shared"
     FILES
-        Button.qml
-        CheckBox.qml
-        Label.qml
-        LauncherList.qml
-        SimpleLauncherDelegate.qml
-        Slider.qml
-        TextField.qml
-        images/back.png
-        images/checkmark.png
-        images/next.png
-        images/slider_handle.png
+        ${quick_shared_resource_files}
 )
 
 
diff --git a/tests/manual/v4/auto/executableallocator/CMakeLists.txt b/tests/manual/v4/auto/executableallocator/CMakeLists.txt
index fd609bfeac..7b571171d6 100644
--- a/tests/manual/v4/auto/executableallocator/CMakeLists.txt
+++ b/tests/manual/v4/auto/executableallocator/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_executableallocator Binary:
 #####################################################################
 
-add_qt_executable(tst_executableallocator
-    GUI
+add_qt_manual_test(tst_executableallocator
     SOURCES
         tst_executableallocator.cpp
     LIBRARIES