Fix manual test builds

Fixes: QTBUG-94256
Change-Id: I3747f1cf94925d3818f277521473cee086eb3082
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

16 files changed, 190 insertions, 135 deletions

diff --git a/tests/manual/barstest/CMakeLists.txt b/tests/manual/barstest/CMakeLists.txt
index 2f52fba7..8c4c9295 100644
--- a/tests/manual/barstest/CMakeLists.txt
+++ b/tests/manual/barstest/CMakeLists.txt
@@ -1,23 +1,29 @@
-qt_add_executable(barstest
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+qt_internal_add_manual_test(barstest
     GUI
     SOURCES
         chart.cpp chart.h
         custominputhandler.cpp custominputhandler.h
         main.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Widgets
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(barstest PUBLIC
+    Qt::Gui
+    Qt::Widgets
+    Qt::DataVisualization
+    )
 
 set(barstest_resource_files
     "shuttle.obj"
     "shuttle.png"
-)
+    )
 
 qt_internal_add_resource(barstest "barstest"
     PREFIX
-        "/"
+    "/"
     FILES
-        ${barstest_resource_files}
-)
+    ${barstest_resource_files}
+    )
diff --git a/tests/manual/directional/CMakeLists.txt b/tests/manual/directional/CMakeLists.txt
index b67312d3..c1bd2798 100644
--- a/tests/manual/directional/CMakeLists.txt
+++ b/tests/manual/directional/CMakeLists.txt
@@ -1,10 +1,16 @@
-qt_add_executable(directional
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+qt_internal_add_manual_test(directional
     GUI
     SOURCES
-        main.cpp
-        scatterdatamodifier.cpp scatterdatamodifier.h
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Widgets
-        Qt::DataVisualization
-)
+    main.cpp
+    scatterdatamodifier.cpp scatterdatamodifier.h
+    )
+target_link_libraries(directional PUBLIC
+    Qt::Gui
+    Qt::Widgets
+    Qt::DataVisualization
+    )
diff --git a/tests/manual/galaxy/CMakeLists.txt b/tests/manual/galaxy/CMakeLists.txt
index 3558ae72..1a530dae 100644
--- a/tests/manual/galaxy/CMakeLists.txt
+++ b/tests/manual/galaxy/CMakeLists.txt
@@ -1,12 +1,11 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 qt_add_executable(galaxy
-    GUI
-    EXCEPTIONS
-    SOURCES
-        cumulativedistributor.cpp cumulativedistributor.h
-        galaxydata.cpp galaxydata.h
-        main.cpp
-        star.cpp star.h
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Widgets
-)
+    cumulativedistributor.cpp cumulativedistributor.h
+    galaxydata.cpp galaxydata.h
+    main.cpp
+    star.cpp star.h
+    )
+target_link_libraries(galaxy PUBLIC
+    Qt::Gui
+    Qt::Widgets
+    )
diff --git a/tests/manual/itemmodeltest/CMakeLists.txt b/tests/manual/itemmodeltest/CMakeLists.txt
index 4cc2676f..7b5faf60 100644
--- a/tests/manual/itemmodeltest/CMakeLists.txt
+++ b/tests/manual/itemmodeltest/CMakeLists.txt
@@ -1,9 +1,10 @@
-qt_add_executable(itemmodeltest
+qt_internal_add_manual_test(itemmodeltest
     GUI
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Widgets
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(itemmodeltest PUBLIC
+    Qt::Gui
+    Qt::Widgets
+    Qt::DataVisualization
+    )
diff --git a/tests/manual/minimalbars/CMakeLists.txt b/tests/manual/minimalbars/CMakeLists.txt
index 202435f2..9f72f667 100644
--- a/tests/manual/minimalbars/CMakeLists.txt
+++ b/tests/manual/minimalbars/CMakeLists.txt
@@ -1,8 +1,9 @@
-qt_add_executable(MinimalBars
+qt_internal_add_manual_test(MinimalBars
     GUI
     SOURCES
         ../../../src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(MinimalBars PUBLIC
+    Qt::Gui
+    Qt::DataVisualization
+    )
diff --git a/tests/manual/minimalscatter/CMakeLists.txt b/tests/manual/minimalscatter/CMakeLists.txt
index d54c2e9b..a1cdcc39 100644
--- a/tests/manual/minimalscatter/CMakeLists.txt
+++ b/tests/manual/minimalscatter/CMakeLists.txt
@@ -1,8 +1,9 @@
-qt_add_executable(MinimalScatter
+qt_internal_add_manual_test(MinimalScatter
     GUI
     SOURCES
         ../../../src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(MinimalScatter PUBLIC
+    Qt::Gui
+    Qt::DataVisualization
+    )
diff --git a/tests/manual/minimalsurface/CMakeLists.txt b/tests/manual/minimalsurface/CMakeLists.txt
index 4007c1fe..a8ca7275 100644
--- a/tests/manual/minimalsurface/CMakeLists.txt
+++ b/tests/manual/minimalsurface/CMakeLists.txt
@@ -1,8 +1,9 @@
-qt_add_executable(minimalSurface
+qt_internal_add_manual_test(MinimalSurface
     GUI
     SOURCES
         ../../../src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(MinimalSurface PUBLIC
+    Qt::Gui
+    Qt::DataVisualization
+    )
diff --git a/tests/manual/multigraphs/CMakeLists.txt b/tests/manual/multigraphs/CMakeLists.txt
index 26d6739e..fdb9e08b 100644
--- a/tests/manual/multigraphs/CMakeLists.txt
+++ b/tests/manual/multigraphs/CMakeLists.txt
@@ -1,21 +1,27 @@
-qt_add_executable(multigraphs
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+qt_internal_add_manual_test(multigraphs
     GUI
     SOURCES
         data.cpp data.h
         main.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Widgets
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(multigraphs PUBLIC
+    Qt::Gui
+    Qt::Widgets
+    Qt::DataVisualization
+    )
 
 set(multigraphs_resource_files
     "australia.png"
-)
+    )
 
 qt_internal_add_resource(multigraphs "multigraphs"
     PREFIX
-        "/"
+    "/"
     FILES
-        ${multigraphs_resource_files}
-)
+    ${multigraphs_resource_files}
+    )
diff --git a/tests/manual/qmldynamicdata/CMakeLists.txt b/tests/manual/qmldynamicdata/CMakeLists.txt
index 62061336..4d051b5e 100644
--- a/tests/manual/qmldynamicdata/CMakeLists.txt
+++ b/tests/manual/qmldynamicdata/CMakeLists.txt
@@ -1,19 +1,20 @@
-qt_add_executable(qmldynamicdata
+qt_internal_add_manual_test(qmldynamicdata
     GUI
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(qmldynamicdata PUBLIC
+    Qt::Gui
+    Qt::DataVisualization
+    )
 
 set(qmldynamicdata_resource_files
     "qml/qmldynamicdata/main.qml"
-)
+    )
 
 qt_internal_add_resource(qmldynamicdata "qmldynamicdata"
     PREFIX
-        "/"
+    "/"
     FILES
-        ${qmldynamicdata_resource_files}
-)
+    ${qmldynamicdata_resource_files}
+    )
diff --git a/tests/manual/qmlgradient/CMakeLists.txt b/tests/manual/qmlgradient/CMakeLists.txt
index 621634e2..d559e261 100644
--- a/tests/manual/qmlgradient/CMakeLists.txt
+++ b/tests/manual/qmlgradient/CMakeLists.txt
@@ -1,24 +1,25 @@
-qt_add_executable(qmlgradient
+qt_internal_add_manual_test(qmlgradient
     GUI
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(qmlgradient PUBLIC
+    Qt::Gui
+    Qt::DataVisualization
+    )
 
 set(qmlgradient_resource_files
     "qml/qmlgradient/main.qml"
     "crater.png"
-)
+    )
 
 set_source_files_properties("crater.png"
     PROPERTIES QT_RESOURCE_ALIAS "map"
-)
+    )
 
 qt_internal_add_resource(qmlgradient "qmlgradient"
     PREFIX
-        "/"
+    "/"
     FILES
-        ${qmlgradient_resource_files}
-)
+    ${qmlgradient_resource_files}
+    )
diff --git a/tests/manual/qmlmultitest/CMakeLists.txt b/tests/manual/qmlmultitest/CMakeLists.txt
index 9fc5cd66..77b3a4a6 100644
--- a/tests/manual/qmlmultitest/CMakeLists.txt
+++ b/tests/manual/qmlmultitest/CMakeLists.txt
@@ -1,20 +1,21 @@
-qt_add_executable(qmlmultitest
+qt_internal_add_manual_test(qmlmultitest
     GUI
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(qmlmultitest PUBLIC
+    Qt::Gui
+    Qt::DataVisualization
+    )
 
 set(qmlmultitest_resource_files
     "qml/qmlmultitest/Data.qml"
     "qml/qmlmultitest/main.qml"
-)
+    )
 
 qt_internal_add_resource(qmlmultitest "qmlmultitest"
     PREFIX
-        "/"
+    "/"
     FILES
-        ${qmlmultitest_resource_files}
-)
+    ${qmlmultitest_resource_files}
+    )
diff --git a/tests/manual/qmlperf/CMakeLists.txt b/tests/manual/qmlperf/CMakeLists.txt
index c26c0bba..141ba0c8 100644
--- a/tests/manual/qmlperf/CMakeLists.txt
+++ b/tests/manual/qmlperf/CMakeLists.txt
@@ -1,20 +1,26 @@
-qt_add_executable(qmlperf
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+qt_internal_add_manual_test(qmlperf
     GUI
     SOURCES
         datagenerator.cpp datagenerator.h
         main.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(qmlperf PUBLIC
+    Qt::Gui
+    Qt::DataVisualization
+    )
 
 set(qmlperf_resource_files
     "qml/qmlperf/main.qml"
-)
+    )
 
 qt_internal_add_resource(qmlperf "qmlperf"
     PREFIX
-        "/"
+    "/"
     FILES
-        ${qmlperf_resource_files}
-)
+    ${qmlperf_resource_files}
+    )
diff --git a/tests/manual/qmlvolume/CMakeLists.txt b/tests/manual/qmlvolume/CMakeLists.txt
index 2158ae22..eeaa572a 100644
--- a/tests/manual/qmlvolume/CMakeLists.txt
+++ b/tests/manual/qmlvolume/CMakeLists.txt
@@ -1,20 +1,26 @@
-qt_add_executable(qmlvolume
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+qt_internal_add_manual_test(qmlvolume
     GUI
     SOURCES
         datasource.cpp datasource.h
         main.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(qmlvolume PUBLIC
+    Qt::Gui
+    Qt::DataVisualization
+    )
 
 set(qmlvolume_resource_files
     "qml/qmlvolume/main.qml"
-)
+    )
 
 qt_internal_add_resource(qmlvolume "qmlvolume"
     PREFIX
-        "/"
+    "/"
     FILES
-        ${qmlvolume_resource_files}
-)
+    ${qmlvolume_resource_files}
+    )
diff --git a/tests/manual/scattertest/CMakeLists.txt b/tests/manual/scattertest/CMakeLists.txt
index 46f7b1de..00177653 100644
--- a/tests/manual/scattertest/CMakeLists.txt
+++ b/tests/manual/scattertest/CMakeLists.txt
@@ -1,10 +1,16 @@
-qt_add_executable(scattertest
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+qt_internal_add_manual_test(scattertest
     GUI
     SOURCES
         main.cpp
         scatterchart.cpp scatterchart.h
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Widgets
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(scattertest PUBLIC
+    Qt::Gui
+    Qt::Widgets
+    Qt::DataVisualization
+    )
diff --git a/tests/manual/surfacetest/CMakeLists.txt b/tests/manual/surfacetest/CMakeLists.txt
index 1555b70d..c59f9488 100644
--- a/tests/manual/surfacetest/CMakeLists.txt
+++ b/tests/manual/surfacetest/CMakeLists.txt
@@ -1,28 +1,34 @@
-qt_add_executable(surfacetest
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+qt_internal_add_manual_test(surfacetest
     GUI
     SOURCES
         graphmodifier.cpp graphmodifier.h
         main.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Widgets
-        Qt::DataVisualization
-)
+    )
+target_link_libraries(surfacetest PUBLIC
+    Qt::Gui
+    Qt::Widgets
+    Qt::DataVisualization
+    )
 
 set_source_files_properties("Heightmap.png"
     PROPERTIES QT_RESOURCE_ALIAS "map"
-)
+    )
 set_source_files_properties("mapimage.png"
     PROPERTIES QT_RESOURCE_ALIAS "mapimage"
-)
+    )
 set(surfacetest_resource_files
     "Heightmap.png"
     "mapimage.png"
-)
+    )
 
 qt_internal_add_resource(surfacetest "surfacetest"
     PREFIX
-        "/maps"
+    "/maps"
     FILES
-        ${surfacetest_resource_files}
-)
+    ${surfacetest_resource_files}
+    )
diff --git a/tests/manual/volumetrictest/CMakeLists.txt b/tests/manual/volumetrictest/CMakeLists.txt
index 723d0ccd..c0f698f1 100644
--- a/tests/manual/volumetrictest/CMakeLists.txt
+++ b/tests/manual/volumetrictest/CMakeLists.txt
@@ -1,26 +1,33 @@
-qt_add_executable(volumetrictest
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+qt_internal_add_manual_test(volumetrictest
     GUI
     SOURCES
         main.cpp
         volumetrictest.cpp volumetrictest.h
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Widgets
-        Qt::DataVisualization
-)
+    )
+
+target_link_libraries(volumetrictest PUBLIC
+    Qt::Gui
+    Qt::Widgets
+    Qt::DataVisualization
+    )
 
 set_source_files_properties("cubeFilledFlat.obj"
     PROPERTIES QT_RESOURCE_ALIAS "mesh"
-)
+    )
 set(volumetrictest_resource_files
     "cubeFilledFlat.obj"
     "logo.png"
     "logo_no_padding.png"
-)
+    )
 
 qt_internal_add_resource(volumetrictest "volumetrictest"
     PREFIX
-        "/"
+    "/"
     FILES
-        ${volumetrictest_resource_files}
-)
+    ${volumetrictest_resource_files}
+    )