Regenerate required projects after dev -> wip/cmake merge

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

15 files changed, 32 insertions, 9 deletions

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