CMake: Regenerate qtdeclarative/tests

Includes:
 - new api calls
 - some new dependencies
 - some TARGET_DESCRIPTION
 - some additional tool directory exclusion when cross-compiling
   (qmlplugindump)
 - some missing add_subdirectory calls

Change-Id: Iea43e45b94f37367ffc1d8dd6ce0ff1021a31b1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

17 files changed, 70 insertions, 24 deletions

diff --git a/tests/auto/qml/.prev_CMakeLists.txt b/tests/auto/qml/.prev_CMakeLists.txt
index 7bcdb68e09..3ac0c2f5be 100644
--- a/tests/auto/qml/.prev_CMakeLists.txt
+++ b/tests/auto/qml/.prev_CMakeLists.txt
@@ -1,5 +1,10 @@
 # Generated from qml.pro.
 
+
+qt_exclude_tool_directories_from_default_target(
+    qmlplugindump
+)
+
 add_subdirectory(parserstress)
 add_subdirectory(qjsvalueiterator)
 add_subdirectory(qjsonbinding)
@@ -84,3 +89,6 @@ if(QT_FEATURE_private_tests)
     add_subdirectory(bindingdependencyapi)
     add_subdirectory(v4misc)
 endif()
+if(NOT CMAKE_CROSSCOMPILING)
+    add_subdirectory(qmltyperegistrar)
+endif()
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
index dec41a2219..af8859f4d9 100644
--- a/tests/auto/qml/CMakeLists.txt
+++ b/tests/auto/qml/CMakeLists.txt
@@ -1,5 +1,10 @@
 # Generated from qml.pro.
 
+
+qt_exclude_tool_directories_from_default_target(
+    qmlplugindump
+)
+
 add_subdirectory(parserstress)
 add_subdirectory(qjsvalueiterator)
 add_subdirectory(qjsonbinding)
@@ -90,3 +95,6 @@ if(QT_FEATURE_private_tests)
     add_subdirectory(bindingdependencyapi)
     add_subdirectory(v4misc)
 endif()
+if(NOT CMAKE_CROSSCOMPILING)
+    # add_subdirectory(qmltyperegistrar) # special case need to port
+endif()
diff --git a/tests/auto/qml/ecmascripttests/CMakeLists.txt b/tests/auto/qml/ecmascripttests/CMakeLists.txt
index 06296fd91d..4b22007c7b 100644
--- a/tests/auto/qml/ecmascripttests/CMakeLists.txt
+++ b/tests/auto/qml/ecmascripttests/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_ecmascripttests Test:
 #####################################################################
 
-add_qt_test(tst_ecmascripttests
+qt_add_test(tst_ecmascripttests
     SOURCES
         qjstest/test262runner.cpp qjstest/test262runner.h
         tst_ecmascripttests.cpp
diff --git a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
index 434c207024..3c69aa04d4 100644
--- a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
+++ b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_tool(qjstest
+    TARGET_DESCRIPTION "Javascript test runner"
     SOURCES
         main.cpp
         test262runner.cpp test262runner.h
diff --git a/tests/auto/qml/qmlplugindump/CMakeLists.txt b/tests/auto/qml/qmlplugindump/CMakeLists.txt
index 5f806b498b..9ef606bae0 100644
--- a/tests/auto/qml/qmlplugindump/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmlplugindump Test:
 #####################################################################
 
-add_qt_test(tst_qmlplugindump
+qt_add_test(tst_qmlplugindump
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qmlplugindump.cpp
@@ -20,12 +20,12 @@ add_qt_test(tst_qmlplugindump
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmlplugindump CONDITION ANDROID OR IOS
+qt_extend_target(tst_qmlplugindump CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qmlplugindump CONDITION NOT ANDROID AND NOT IOS
+qt_extend_target(tst_qmlplugindump CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt
index cecbcba683..695651f90e 100644
--- a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlapplicationengine
+qt_add_test(tst_qqmlapplicationengine
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlapplicationengine.cpp
@@ -30,7 +30,7 @@ set(tst_qqmlapplicationengine_resource_files
     "data/loadTranslation.qml"
 )
 
-add_qt_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine"
+qt_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine"
     PREFIX
         "/"
     FILES
@@ -44,12 +44,12 @@ add_qt_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS
+qt_extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS
+qt_extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
index fd45760a35..62647409c1 100644
--- a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Generated from tst_qqmlenginecleanup.pro.
+# Generated from qqmlenginecleanup.pro.
 
 #####################################################################
 ## tst_qqmlenginecleanup Test:
@@ -11,7 +11,6 @@ qt_add_test(tst_qqmlenginecleanup
     INCLUDE_DIRECTORIES
         ../../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
         Qt::Qml
         Qt::QmlPrivate
 )
@@ -28,3 +27,4 @@ qt_extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
+add_subdirectory(CustomModuleImport)
diff --git a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
index d7665ece5e..e74104e381 100644
--- a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
@@ -18,7 +18,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_BINARY_DIR}/imports/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlmoduleplugin
+qt_add_test(tst_qqmlmoduleplugin
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -38,7 +38,7 @@ set(qmake_waitingPlugin_resource_files
     "moduleWithWaitingPlugin"
 )
 
-add_qt_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin"
+qt_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
@@ -48,7 +48,7 @@ set(qmake_staticPlugin_resource_files
     "moduleWithStaticPlugin"
 )
 
-add_qt_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
+qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
@@ -59,12 +59,12 @@ add_qt_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS
+qt_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS
+qt_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
index 111fdafb88..d0aa1a9aa9 100644
--- a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
@@ -18,7 +18,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_BINARY_DIR}/imports/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlmoduleplugin
+qt_add_test(tst_qqmlmoduleplugin
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -38,7 +38,7 @@ set(qmake_waitingPlugin_resource_files
     "moduleWithWaitingPlugin"
 )
 
-add_qt_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin"
+qt_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
@@ -48,7 +48,7 @@ set(qmake_staticPlugin_resource_files
     "moduleWithStaticPlugin"
 )
 
-add_qt_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
+qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
@@ -77,12 +77,12 @@ add_qt_resource(tst_qqmlmoduleplugin staticPlugin
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS
+qt_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS
+qt_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
index bad19361a5..961e8efe61 100644
--- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Generated from tst_qqmltypeloader.pro.
+# Generated from qqmltypeloader.pro.
 
 #####################################################################
 ## tst_qqmltypeloader Test:
@@ -19,14 +19,13 @@ qt_add_test(tst_qqmltypeloader
     INCLUDE_DIRECTORIES
         ../../shared
     PUBLIC_LIBRARIES
-        Qt::Gui
         Qt::Qml
         Qt::QmlPrivate
         Qt::Quick
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:tst_qqmltypeloader.pro:<TRUE>:
+#### Keys ignored in scope 2:.:.:tst_qqmltypeloader.pro:<TRUE>:
 # QML_IMPORT_NAME = "declarative.import.for.typeloader.test"
 # QML_IMPORT_VERSION = "3.2"
 
@@ -50,3 +49,4 @@ set_target_properties(tst_qqmltypeloader PROPERTIES
 )
 
 qt6_qml_type_registration(tst_qqmltypeloader)
+add_subdirectory(SlowImport)
diff --git a/tests/auto/quick/.prev_CMakeLists.txt b/tests/auto/quick/.prev_CMakeLists.txt
index 488150c61c..7dd7d217bd 100644
--- a/tests/auto/quick/.prev_CMakeLists.txt
+++ b/tests/auto/quick/.prev_CMakeLists.txt
@@ -21,6 +21,8 @@ if(QT_FEATURE_private_tests)
     add_subdirectory(qquickstyledtext)
     add_subdirectory(qquickstates)
     add_subdirectory(qquicksystempalette)
+    add_subdirectory(qquickcolorgroup)
+    add_subdirectory(qquickpalette)
     add_subdirectory(qquicktimeline)
     add_subdirectory(pointerhandlers)
     add_subdirectory(qquickaccessible)
diff --git a/tests/auto/quick/CMakeLists.txt b/tests/auto/quick/CMakeLists.txt
index 6cb3c23334..d0dfca5ff4 100644
--- a/tests/auto/quick/CMakeLists.txt
+++ b/tests/auto/quick/CMakeLists.txt
@@ -21,6 +21,8 @@ if(QT_FEATURE_private_tests)
     add_subdirectory(qquickstyledtext)
     add_subdirectory(qquickstates)
     add_subdirectory(qquicksystempalette)
+    # add_subdirectory(qquickcolorgroup) # special case need to port
+    # add_subdirectory(qquickpalette) # special case need to port
     add_subdirectory(qquicktimeline)
     # add_subdirectory(pointerhandlers) # skip building until fixed in dev # special case
     add_subdirectory(qquickaccessible)
diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt
index e0f9d38f90..822650e91e 100644
--- a/tests/auto/quick/qquickanimations/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimations/CMakeLists.txt
@@ -29,7 +29,7 @@ qt_add_test(tst_qquickanimations
 )
 
 #### Keys ignored in scope 1:.:.:qquickanimations.pro:<TRUE>:
-# OTHER_FILES = "data/animationJobSelfDestructionBug.qml" "data/attached.qml" "data/badproperty1.qml" "data/badproperty2.qml" "data/badtype1.qml" "data/badtype2.qml" "data/badtype3.qml" "data/badtype4.qml" "data/disabledTransition.qml" "data/dontAutoStart.qml" "data/dontStart.qml" "data/dontStart2.qml" "data/dotproperty.qml" "data/Double.qml" "data/doubleRegistrationBug.qml" "data/fastFlickingBug.qml" "data/looping.qml" "data/mixedtype1.qml" "data/mixedtype2.qml" "data/nonTransitionBug.qml" "data/parallelAnimationNullChildBug.qml" "data/pathAnimation.qml" "data/pathAnimation2.qml" "data/pathAnimationInOutBackCrash.qml" "data/pathAnimationNoStart.qml" "data/pathInterpolator.qml" "data/pathInterpolatorBack.qml" "data/pathInterpolatorBack2.qml" "data/pathTransition.qml" "data/pauseBindingBug.qml" "data/pauseBug.qml" "data/properties.qml" "data/properties2.qml" "data/properties3.qml" "data/properties4.qml" "data/properties5.qml" "data/propertiesTransition.qml" "data/propertiesTransition2.qml" "data/propertiesTransition3.qml" "data/propertiesTransition4.qml" "data/propertiesTransition5.qml" "data/propertiesTransition6.qml" "data/propertiesTransition7.qml" "data/reanchor.qml" "data/registrationBug.qml" "data/reparent.qml" "data/rotation.qml" "data/runningTrueBug.qml" "data/scriptActionBug.qml" "data/scriptActionCrash.qml" "data/sequentialAnimationNullChildBug.qml" "data/signals.qml" "data/transitionAssignmentBug.qml" "data/valuesource.qml" "data/valuesource2.qml"
+# OTHER_FILES = "data/animationJobSelfDestructionBug.qml" "data/attached.qml" "data/badproperty1.qml" "data/badproperty2.qml" "data/badtype1.qml" "data/badtype2.qml" "data/badtype3.qml" "data/badtype4.qml" "data/disabledTransition.qml" "data/dontAutoStart.qml" "data/dontStart.qml" "data/dontStart2.qml" "data/dotproperty.qml" "data/Double.qml" "data/doubleRegistrationBug.qml" "data/fastFlickingBug.qml" "data/looping.qml" "data/mixedtype1.qml" "data/mixedtype2.qml" "data/nonTransitionBug.qml" "data/parallelAnimationNullChildBug.qml" "data/pathAnimation.qml" "data/pathAnimation2.qml" "data/pathAnimationInOutBackCrash.qml" "data/pathAnimationNoStart.qml" "data/pathInterpolator.qml" "data/pathInterpolatorBack.qml" "data/pathInterpolatorBack2.qml" "data/pathTransition.qml" "data/pauseBindingBug.qml" "data/pauseBug.qml" "data/properties.qml" "data/properties2.qml" "data/properties3.qml" "data/properties4.qml" "data/properties5.qml" "data/propertiesTransition.qml" "data/propertiesTransition2.qml" "data/propertiesTransition3.qml" "data/propertiesTransition4.qml" "data/propertiesTransition5.qml" "data/propertiesTransition6.qml" "data/propertiesTransition7.qml" "data/reanchor.qml" "data/registrationBug.qml" "data/reparent.qml" "data/rotation.qml" "data/runningTrueBug.qml" "data/scriptActionBug.qml" "data/scriptActionCrash.qml" "data/sequentialAnimationNullChildBug.qml" "data/signals.qml" "data/signalorder.qml" "data/transitionAssignmentBug.qml" "data/valuesource.qml" "data/valuesource2.qml"
 
 ## Scopes:
 #####################################################################
diff --git a/tests/auto/quick/qquickcolorgroup/CMakeLists.txt b/tests/auto/quick/qquickcolorgroup/CMakeLists.txt
index 99506fc24d..c873b87934 100644
--- a/tests/auto/quick/qquickcolorgroup/CMakeLists.txt
+++ b/tests/auto/quick/qquickcolorgroup/CMakeLists.txt
@@ -1,8 +1,18 @@
+# Generated from qquickcolorgroup.pro.
+
+#####################################################################
+## tst_qquickcolorgroup Test:
+#####################################################################
+
 qt_add_test(tst_qquickcolorgroup
     SOURCES
         tst_qquickcolorgroup.cpp
     PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::QmlPrivate
         Qt::QuickPrivate
 )
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/quick/qquickpalette/CMakeLists.txt b/tests/auto/quick/qquickpalette/CMakeLists.txt
index 20a8081c48..70bf19305c 100644
--- a/tests/auto/quick/qquickpalette/CMakeLists.txt
+++ b/tests/auto/quick/qquickpalette/CMakeLists.txt
@@ -1,8 +1,18 @@
+# Generated from qquickpalette.pro.
+
+#####################################################################
+## tst_qquickpalette Test:
+#####################################################################
+
 qt_add_test(tst_qquickpalette
     SOURCES
         tst_qquickpalette.cpp
     PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::QmlPrivate
         Qt::QuickPrivate
 )
+
+## Scopes:
+#####################################################################
diff --git a/tests/benchmarks/quick/.prev_CMakeLists.txt b/tests/benchmarks/quick/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..0319ca484e
--- /dev/null
+++ b/tests/benchmarks/quick/.prev_CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from quick.pro.
+
+add_subdirectory(events)
+add_subdirectory(colorresolving)
diff --git a/tests/benchmarks/quick/CMakeLists.txt b/tests/benchmarks/quick/CMakeLists.txt
index 533f382398..acb866acd2 100644
--- a/tests/benchmarks/quick/CMakeLists.txt
+++ b/tests/benchmarks/quick/CMakeLists.txt
@@ -1,3 +1,4 @@
 # Generated from quick.pro.
 
 add_subdirectory(events)
+# add_subdirectory(colorresolving) # special case to be ported