Regenerate required projects after dev -> wip/cmake merge

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

22 files changed, 106 insertions, 56 deletions

diff --git a/examples/quick/scenegraph/.prev_CMakeLists.txt b/examples/quick/scenegraph/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f4e416390a
--- /dev/null
+++ b/examples/quick/scenegraph/.prev_CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from scenegraph.pro.
+
+add_subdirectory(customgeometry)
+add_subdirectory(rendernode)
+add_subdirectory(threadedanimation)
+if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
+    add_subdirectory(graph)
+    add_subdirectory(simplematerial)
+    add_subdirectory(sgengine)
+    add_subdirectory(fboitem)
+    add_subdirectory(openglunderqml)
+    add_subdirectory(textureinthread)
+    add_subdirectory(twotextureproviders)
+endif()
+if(APPLE_OSX)
+    add_subdirectory(metalunderqml)
+    add_subdirectory(metaltextureimport)
+endif()
+if(WIN32)
+    add_subdirectory(d3d11underqml)
+endif()
+if(QT_FEATURE_vulkan)
+    add_subdirectory(vulkanunderqml)
+endif()
diff --git a/examples/quick/scenegraph/CMakeLists.txt b/examples/quick/scenegraph/CMakeLists.txt
index c18f77b937..32f5152235 100644
--- a/examples/quick/scenegraph/CMakeLists.txt
+++ b/examples/quick/scenegraph/CMakeLists.txt
@@ -7,14 +7,18 @@ if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
     add_subdirectory(graph)
     add_subdirectory(simplematerial)
     add_subdirectory(sgengine)
-    add_subdirectory(textureinsgnode)
+    add_subdirectory(fboitem)
     add_subdirectory(openglunderqml)
     add_subdirectory(textureinthread)
     add_subdirectory(twotextureproviders)
 endif()
 if(APPLE_OSX)
     add_subdirectory(metalunderqml)
+    # add_subdirectory(metaltextureimport) special case TODO
 endif()
 if(WIN32)
     add_subdirectory(d3d11underqml)
 endif()
+if(QT_FEATURE_vulkan)
+    add_subdirectory(vulkanunderqml)
+endif()
diff --git a/examples/quick/scenegraph/fboitem/CMakeLists.txt b/examples/quick/scenegraph/fboitem/CMakeLists.txt
index 1117ef22a9..e788fe5468 100644
--- a/examples/quick/scenegraph/fboitem/CMakeLists.txt
+++ b/examples/quick/scenegraph/fboitem/CMakeLists.txt
@@ -1,7 +1,7 @@
-# Generated from textureinsgnode.pro.
+# Generated from fboitem.pro.
 
 cmake_minimum_required(VERSION 3.14)
-project(textureinsgnode LANGUAGES CXX)
+project(fboitem LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -9,23 +9,23 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/textureinsgnode")
+set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/fboitem")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
 
-add_qt_gui_executable(textureinsgnode
+add_qt_gui_executable(fboitem
     ../shared/logorenderer.cpp ../shared/logorenderer.h
     fboinsgrenderer.cpp fboinsgrenderer.h
     main.cpp
 )
-target_include_directories(textureinsgnode PUBLIC
+target_include_directories(fboitem PUBLIC
     ../shared
 )
 
-target_link_libraries(textureinsgnode PUBLIC
+target_link_libraries(fboitem PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Qml
@@ -34,18 +34,18 @@ target_link_libraries(textureinsgnode PUBLIC
 
 
 # Resources:
-set(textureinsgnode_resource_files
+set(fboitem_resource_files
     "main.qml"
 )
 
-qt6_add_resources(textureinsgnode "textureinsgnode"
+qt6_add_resources(fboitem "fboitem"
     PREFIX
-        "/scenegraph/textureinsgnode"
+        "/scenegraph/fboitem"
     FILES
-        ${textureinsgnode_resource_files}
+        ${fboitem_resource_files}
 )
 
-install(TARGETS textureinsgnode
+install(TARGETS fboitem
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/rendernode/CMakeLists.txt b/examples/quick/scenegraph/rendernode/CMakeLists.txt
index 05ed4dab42..51de91a37e 100644
--- a/examples/quick/scenegraph/rendernode/CMakeLists.txt
+++ b/examples/quick/scenegraph/rendernode/CMakeLists.txt
@@ -56,17 +56,6 @@ if(QT_FEATURE_d3d12)
     )
 endif()
 
-if(QT_FEATURE_d3d12)
-    target_sources(rendernode PUBLIC
-        d3d12renderer.cpp d3d12renderer.h
-    )
-
-    target_link_libraries(rendernode PUBLIC
-        d3d12
-    )
-
-endif()
-
 if(APPLE_OSX)
     target_sources(rendernode PUBLIC
         metalrenderer.h metalrenderer.mm
@@ -76,7 +65,6 @@ if(APPLE_OSX)
         "-framework AppKit"
         "-framework Metal"
     )
-
 endif()
 
 install(TARGETS rendernode
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
index 1399ad533a..64dce0170b 100644
--- a/src/imports/CMakeLists.txt
+++ b/src/imports/CMakeLists.txt
@@ -35,6 +35,6 @@ endif()
 if(QT_FEATURE_quick_particles AND TARGET Qt::Quick)
     add_subdirectory(particles)
 endif()
-if(QT_FEATURE_quick_path AND QT_FEATURE_thread AND TARGET Qt::Quick)
+if(QT_FEATURE_quick_path AND TARGET Qt::Quick)
     add_subdirectory(shapes)
 endif()
diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt
index e0b322552e..a296eed5f2 100644
--- a/src/imports/labsanimation/CMakeLists.txt
+++ b/src/imports/labsanimation/CMakeLists.txt
@@ -11,6 +11,7 @@ add_qml_module(labsanimationplugin
     SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
+        qquickboundaryrule.cpp qquickboundaryrule_p.h
     LIBRARIES
         Qt::QmlPrivate
         Qt::QuickPrivate
diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt
index 22ee1b947b..665b03e02c 100644
--- a/src/imports/localstorage/CMakeLists.txt
+++ b/src/imports/localstorage/CMakeLists.txt
@@ -11,6 +11,7 @@ add_qml_module(qmllocalstorageplugin
     SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
+        qquicklocalstorage.cpp qquicklocalstorage_p.h
     LIBRARIES
         Qt::CorePrivate
         Qt::QmlPrivate
diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt
index f06fed1765..187ec496f7 100644
--- a/src/imports/statemachine/CMakeLists.txt
+++ b/src/imports/statemachine/CMakeLists.txt
@@ -16,6 +16,7 @@ add_qml_module(qtqmlstatemachine
         signaltransition.cpp signaltransition.h
         state.cpp state.h
         statemachine.cpp statemachine.h
+        statemachineforeign.h
         timeouttransition.cpp timeouttransition.h
     LIBRARIES
         Qt::CorePrivate
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index 222e2a622b..ee1f3cb31f 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -330,8 +330,8 @@ add_qt_module(Qml
 
 # QLALR Grammars:
 qt_process_qlalr(
-    parser/qqmljs.g
     Qml
+    parser/qqmljs.g
     ""
 )
 
@@ -505,7 +505,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_locale
 
 extend_target(Qml CONDITION ANDROID
     DEFINES
-        LIBS_SUFFIX='\\"_.so\\"'
+        LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"'
 )
 
 extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index 860eb242e3..0837084af5 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -331,8 +331,8 @@ add_qt_module(Qml
 # special case begin remove the block, handled manually
 # QLALR Grammars:
 #qt_process_qlalr(
-#    parser/qqmljs.g
 #    Qml
+#    parser/qqmljs.g
 #    ""
 #)
 # special case end
@@ -514,7 +514,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_locale
 
 extend_target(Qml CONDITION ANDROID
     DEFINES
-        LIBS_SUFFIX='\\"_.so\\"'
+        LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"'
 )
 
 extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt
index 23bc696917..7bd3f0de9e 100644
--- a/src/qmldevtools/.prev_CMakeLists.txt
+++ b/src/qmldevtools/.prev_CMakeLists.txt
@@ -52,8 +52,8 @@ add_qt_module(QmlDevTools
 
 # QLALR Grammars:
 qt_process_qlalr(
-    ../qml/parser/qqmljs.g
     QmlDevTools
+    ../qml/parser/qqmljs.g
     ""
 )
 
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index bbfedc60e6..4b6ea4e392 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -58,3 +58,7 @@ extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
         qqmllistcompositor.cpp qqmllistcompositor_p.h
         qquickpackage.cpp qquickpackage_p.h
 )
+add_qt_docs(QmlModels
+    doc/qtqmlmodels.qdocconf
+)
+
diff --git a/src/qmlmodels/configure.cmake b/src/qmlmodels/configure.cmake
index 43c3ac8aab..b1242a2aa1 100644
--- a/src/qmlmodels/configure.cmake
+++ b/src/qmlmodels/configure.cmake
@@ -35,5 +35,5 @@ qt_feature("qml_table_model" PRIVATE
     SECTION "QML"
     LABEL "QML table model"
     PURPOSE "Provides the TableModel QML type."
-    CONDITION QT_FEATURE_qml_itemmodel
+    CONDITION QT_FEATURE_qml_itemmodel AND QT_FEATURE_qml_delegate_model
 )
diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt
index 0661a38709..9ff4ade822 100644
--- a/src/qmltest/.prev_CMakeLists.txt
+++ b/src/qmltest/.prev_CMakeLists.txt
@@ -12,6 +12,7 @@ add_qt_module(QuickTest
         quicktestevent.cpp quicktestevent_p.h
         quicktestglobal.h
         quicktestresult.cpp quicktestresult_p.h
+        quicktestutil.cpp quicktestutil_p.h
     DEFINES
         QT_NO_FOREACH
         QT_NO_URL_CAST_FROM_STRING
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
index 55438e1ff4..ead409288f 100644
--- a/src/qmltest/CMakeLists.txt
+++ b/src/qmltest/CMakeLists.txt
@@ -12,6 +12,7 @@ add_qt_module(QuickTest
         quicktestevent.cpp quicktestevent_p.h
         quicktestglobal.h
         quicktestresult.cpp quicktestresult_p.h
+        quicktestutil.cpp quicktestutil_p.h
     DEFINES
         QT_NO_FOREACH
         QT_NO_URL_CAST_FROM_STRING
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
index 51b6df5ea3..c78d4065f3 100644
--- a/src/qmlworkerscript/.prev_CMakeLists.txt
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -93,3 +93,7 @@ extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGRE
 
 #### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
 # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
+add_qt_docs(QmlWorkerScript
+    doc/qtqmlworkerscript.qdocconf
+)
+
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 9abfb586ba..893da25b6b 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -93,3 +93,7 @@ extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGRE
 
 #### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
 # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
+add_qt_docs(QmlWorkerScript
+    doc/qtqmlworkerscript.qdocconf
+)
+
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 06051a2fbc..eea86746a7 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -116,6 +116,7 @@ add_qt_module(Quick
         scenegraph/qsgcontext.cpp scenegraph/qsgcontext_p.h
         scenegraph/qsgcontextplugin.cpp scenegraph/qsgcontextplugin_p.h
         scenegraph/qsgrenderloop.cpp scenegraph/qsgrenderloop_p.h
+        scenegraph/qsgrhisupport.cpp scenegraph/qsgrhisupport_p.h
         scenegraph/util/qsgareaallocator.cpp scenegraph/util/qsgareaallocator_p.h
         scenegraph/util/qsgengine.cpp scenegraph/util/qsgengine.h scenegraph/util/qsgengine_p.h
         scenegraph/util/qsgflatcolormaterial.cpp scenegraph/util/qsgflatcolormaterial.h
@@ -140,9 +141,9 @@ add_qt_module(Quick
         util/qquickanimatorjob.cpp util/qquickanimatorjob_p.h
         util/qquickapplication.cpp util/qquickapplication_p.h
         util/qquickbehavior.cpp util/qquickbehavior_p.h
-        util/qquickboundaryrule.cpp util/qquickboundaryrule_p.h
         util/qquickfontloader.cpp util/qquickfontloader_p.h
         util/qquickfontmetrics.cpp util/qquickfontmetrics_p.h
+        util/qquickforeignutils_p.h
         util/qquickglobal.cpp
         util/qquickimageprovider.cpp util/qquickimageprovider.h util/qquickimageprovider_p.h
         util/qquickpixmapcache.cpp util/qquickpixmapcache_p.h
@@ -449,7 +450,6 @@ extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FE
         scenegraph/qsgrhidistancefieldglyphcache.cpp scenegraph/qsgrhidistancefieldglyphcache_p.h
         scenegraph/qsgrhilayer.cpp scenegraph/qsgrhilayer_p.h
         scenegraph/qsgrhishadereffectnode.cpp scenegraph/qsgrhishadereffectnode_p.h
-        scenegraph/qsgrhisupport.cpp scenegraph/qsgrhisupport_p.h
         scenegraph/qsgrhitextureglyphcache.cpp scenegraph/qsgrhitextureglyphcache_p.h
         scenegraph/qsgwindowsrenderloop.cpp scenegraph/qsgwindowsrenderloop_p.h
         scenegraph/util/qsgdefaultimagenode.cpp scenegraph/util/qsgdefaultimagenode_p.h
diff --git a/src/quick/configure.cmake b/src/quick/configure.cmake
index 24b8b9f39e..26213be687 100644
--- a/src/quick/configure.cmake
+++ b/src/quick/configure.cmake
@@ -11,6 +11,12 @@
 #### Tests
 
 
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/d3d12/CMakeLists.txt")
+    qt_config_compile_test("d3d12"
+                           LABEL "Direct3D 12"
+                           PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/d3d12")
+endif()
+
 
 #### Features
 
diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt
index f834c78309..46a692eb4e 100644
--- a/tests/auto/qml/qmlcachegen/CMakeLists.txt
+++ b/tests/auto/qml/qmlcachegen/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_qmlcachegen
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qmlcachegen.cpp
@@ -65,14 +62,14 @@ set_source_files_properties("data/Retain.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Retain.qml"
 )
 set(retain_resource_files
-    "data/Retain.qml"
+    "Retain.qml"
 )
 
-set_source_files_properties(${retain_resource_files} PROPERTIES QT_RETAIN_QUICKCOMPILER 1)
-
 add_qt_resource(tst_qmlcachegen "retain"
     PREFIX
         "/"
+    BASE
+        "data"
     FILES
         ${retain_resource_files}
 )
@@ -82,8 +79,10 @@ set(qmake_immediate_resource_files
     "data/jsimport.qml"
     "data/jsmoduleimport.qml"
     "data/library.js"
+    "data/module.mjs"
     "data/script.js"
     "data/script.mjs"
+    "data/utils.mjs"
     "data/versionchecks.qml"
 )
 
diff --git a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt
index afb34d3423..8d6c8910aa 100644
--- a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt
+++ b/tests/auto/quick/qquickboundaryrule/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_qquickboundaryrule
-    GUI
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,15 +33,9 @@ add_qt_test(tst_qquickboundaryrule
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qquickboundaryrule.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickboundaryrule.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qquickboundaryrule CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt
index 083a08cf10..ea66f99c0c 100644
--- a/tests/auto/quick/qquickdroparea/CMakeLists.txt
+++ b/tests/auto/quick/qquickdroparea/CMakeLists.txt
@@ -4,10 +4,23 @@
 ## tst_qquickdroparea 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_qquickdroparea
-    GUI
     SOURCES
+        ../../shared/util.cpp ../../shared/util.h
+        ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
+        ../shared/viewtestutil.cpp ../shared/viewtestutil.h
+        ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickdroparea.cpp
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+    INCLUDE_DIRECTORIES
+        ../../shared
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
@@ -18,13 +31,21 @@ add_qt_test(tst_qquickdroparea
         Qt::Network
         Qt::Qml
         Qt::Quick
+    TESTDATA ${test_data}
 )
 
 #### Keys ignored in scope 1:.:.:qquickdroparea.pro:<TRUE>:
-# CONFIG = "testcase"
+# OTHER_FILES = "data/*.qml"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qquickdroparea.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
+extend_target(tst_qquickdroparea CONDITION ANDROID OR APPLE_IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT APPLE_IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)