Regenerate the necessary bits of qtdeclarative after wip/qt6 merge

Change-Id: If58c29baf7fa3c3591968fca6d11f7649308dbf9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

3 files changed, 48 insertions, 23 deletions

diff --git a/tests/auto/qml/qmllint/CMakeLists.txt b/tests/auto/qml/qmllint/CMakeLists.txt
index a9995910ae..a4bc65a0da 100644
--- a/tests/auto/qml/qmllint/CMakeLists.txt
+++ b/tests/auto/qml/qmllint/CMakeLists.txt
@@ -1,19 +1,35 @@
 # Generated from qmllint.pro.
 
 #####################################################################
-## testqmllint Binary:
+## tst_qmllint Test:
 #####################################################################
 
-add_qt_executable(testqmllint
-    GUI
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qmllint
     SOURCES
-        main.cpp
+        ../../shared/util.cpp ../../shared/util.h
+        tst_qmllint.cpp
     INCLUDE_DIRECTORIES
-        .
+        ../../shared
     PUBLIC_LIBRARIES
         Qt::Gui
-        Qt::Test
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmllint CONDITION ANDROID OR APPLE_IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-#### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>:
-# TEMPLATE = "app"
+extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT APPLE_IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt
index 86958dfc81..9ed977bddc 100644
--- a/tests/auto/qml/qqmllanguage/CMakeLists.txt
+++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt
@@ -5,15 +5,12 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qqmllanguage
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -33,14 +30,26 @@ add_qt_test(tst_qqmllanguage
 )
 
 #### Keys ignored in scope 1:.:.:qqmllanguage.pro:<TRUE>:
-# CONFIG = "testcase"
 # OTHER_FILES = "data/readonlyObjectProperty.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qqmllanguage.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
+# Resources:
+set_source_files_properties("data/I18nType30.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "data/I18nTypeÁâãäå.qml"
+)
+set(qqmllanguage_resource_files
+    "data/I18nType30.qml"
+)
+
+add_qt_resource(tst_qqmllanguage "qqmllanguage"
+    PREFIX
+        "/"
+    FILES
+        ${qqmllanguage_resource_files}
+)
+
 
 extend_target(tst_qqmllanguage CONDITION ANDROID OR APPLE_IOS
     DEFINES
diff --git a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
index fc7da3df75..2daf727a5c 100644
--- a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
@@ -4,8 +4,13 @@
 ## tst_qqmlpropertymap Test:
 #####################################################################
 
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 add_qt_test(tst_qqmlpropertymap
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlpropertymap.cpp
@@ -20,17 +25,12 @@ add_qt_test(tst_qqmlpropertymap
         Qt::Gui
         Qt::Qml
         Qt::Quick
+    TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qqmlpropertymap.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qqmlpropertymap.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qqmlpropertymap CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"