Post Merge Fixes

Change-Id: I13bc3aef318d8b497b01c61fcca7760abd96339a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

10 files changed, 61 insertions, 12 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c8a1d47654..2e05abad20 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,7 +34,7 @@ if(QT_FEATURE_qml_devtools)
     add_subdirectory(qmldevtools)
 
     # Build qmlcachegen now, so that we can use it in src/imports.
-    if(QT_FEATURE_commandlineparser AND QT_FEATURE_xmlstreamwriter)
+    if(QT_FEATURE_commandlineparser AND QT_FEATURE_qml_devtools AND QT_FEATURE_xmlstreamwriter)
         add_subdirectory(../tools/qmlcachegen qmlcachegen)
     endif()
 endif()
diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt
index c198f02016..d72eb4bedd 100644
--- a/src/imports/labsmodels/CMakeLists.txt
+++ b/src/imports/labsmodels/CMakeLists.txt
@@ -23,3 +23,17 @@ qt_add_qml_module(labsmodelsplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "1.0"
 # TARGETPATH = "Qt/labs/qmlmodels"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(labsmodelsplugin CONDITION QT_FEATURE_qml_table_model
+    SOURCES
+        qqmltablemodel.cpp qqmltablemodel_p.h
+        qqmltablemodelcolumn.cpp qqmltablemodelcolumn_p.h
+)
+
+qt_extend_target(labsmodelsplugin CONDITION QT_FEATURE_qml_delegate_model
+    SOURCES
+        qqmldelegatecomponent.cpp qqmldelegatecomponent_p.h
+)
diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt
index 827474f2fb..3f920616f5 100644
--- a/src/imports/qtqml/.prev_CMakeLists.txt
+++ b/src/imports/qtqml/.prev_CMakeLists.txt
@@ -1,5 +1,15 @@
 # Generated from qtqml.pro.
 
+set(module_dynamic_qml_imports
+    QtQml.Models
+)
+
+if (QT_FEATURE_qml_worker_script)
+    list(APPEND module_dynamic_qml_imports
+        QtQml.WorkerScript
+    )
+endif()
+
 #####################################################################
 ## qmlplugin Plugin:
 #####################################################################
@@ -9,10 +19,8 @@ qt_add_qml_module(qmlplugin
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQmlPlugin
-    IMPORTS
-        QtQml.Models
-        QtQml.WorkerScript
     SKIP_TYPE_REGISTRATION
+    IMPORTS ${module_dynamic_qml_imports}
     SOURCES
         plugin.cpp
     LIBRARIES
@@ -25,5 +33,12 @@ qt_add_qml_module(qmlplugin
 
 #### Keys ignored in scope 1:.:.:qtqml.pro:<TRUE>:
 # CXX_MODULE = "qml"
+# DYNAMIC_QMLDIR = "module QtQml" "plugin qmlplugin" "classname QtQmlPlugin" "typeinfo plugins.qmltypes" "designersupported" "import QtQml.Models"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQml"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qtqml.pro:QT_FEATURE_qml_worker_script:
+# DYNAMIC_QMLDIR = "import QtQml.WorkerScript"
diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt
index ac1a8e0834..cabf9f1055 100644
--- a/src/imports/qtqml/CMakeLists.txt
+++ b/src/imports/qtqml/CMakeLists.txt
@@ -1,5 +1,15 @@
 # Generated from qtqml.pro.
 
+set(module_dynamic_qml_imports
+    QtQml.Models
+)
+
+if (QT_FEATURE_qml_worker_script)
+    list(APPEND module_dynamic_qml_imports
+        QtQml.WorkerScript
+    )
+endif()
+
 #####################################################################
 ## qmlplugin Plugin:
 #####################################################################
@@ -9,10 +19,8 @@ qt_add_qml_module(qmlplugin
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQmlPlugin
-    IMPORTS
-        QtQml.Models
-        QtQml.WorkerScript
     SKIP_TYPE_REGISTRATION
+    IMPORTS ${module_dynamic_qml_imports}
     SOURCES
         plugin.cpp
     LIBRARIES
@@ -26,5 +34,12 @@ qt_add_qml_module(qmlplugin
 
 #### Keys ignored in scope 1:.:.:qtqml.pro:<TRUE>:
 # CXX_MODULE = "qml"
+# DYNAMIC_QMLDIR = "module QtQml" "plugin qmlplugin" "classname QtQmlPlugin" "typeinfo plugins.qmltypes" "designersupported" "import QtQml.Models"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQml"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qtqml.pro:QT_FEATURE_qml_worker_script:
+# DYNAMIC_QMLDIR = "import QtQml.WorkerScript"
diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt
index 3287f5c2a6..8e10b2a40a 100644
--- a/src/imports/qtquick2/CMakeLists.txt
+++ b/src/imports/qtquick2/CMakeLists.txt
@@ -10,9 +10,9 @@ qt_add_qml_module(qtquick2plugin
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQuick2Plugin
+    SKIP_TYPE_REGISTRATION
     IMPORTS
         QtQml
-    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt
index e031a6a28f..f4a65e9b3f 100644
--- a/src/imports/window/CMakeLists.txt
+++ b/src/imports/window/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_add_qml_module(windowplugin
     CLASSNAME QtQuick2WindowPlugin
     SKIP_TYPE_REGISTRATION
     SOURCES
-        plugin.cpp
+        plugin.cpp plugin.h
     LIBRARIES
         Qt::QmlPrivate
         Qt::QuickPrivate
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index 92cb639ab1..21119f1827 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -231,6 +231,7 @@ qt_add_module(Qml
         qml/qqmlmetaobject.cpp qml/qqmlmetaobject_p.h
         qml/qqmlmetatype.cpp qml/qqmlmetatype_p.h
         qml/qqmlmetatypedata.cpp qml/qqmlmetatypedata_p.h
+        qml/qqmlmoduleregistration.cpp qml/qqmlmoduleregistration.h
         qml/qqmlnetworkaccessmanagerfactory.cpp qml/qqmlnetworkaccessmanagerfactory.h
         qml/qqmlnotifier.cpp qml/qqmlnotifier_p.h
         qml/qqmlobjectcreator.cpp qml/qqmlobjectcreator_p.h
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index 3d476ad6f6..de6b0623f1 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -231,6 +231,7 @@ qt_add_module(Qml
         qml/qqmlmetaobject.cpp qml/qqmlmetaobject_p.h
         qml/qqmlmetatype.cpp qml/qqmlmetatype_p.h
         qml/qqmlmetatypedata.cpp qml/qqmlmetatypedata_p.h
+        qml/qqmlmoduleregistration.cpp qml/qqmlmoduleregistration.h
         qml/qqmlnetworkaccessmanagerfactory.cpp qml/qqmlnetworkaccessmanagerfactory.h
         qml/qqmlnotifier.cpp qml/qqmlnotifier_p.h
         qml/qqmlobjectcreator.cpp qml/qqmlobjectcreator_p.h
diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake
index d26aabee28..067eb52218 100644
--- a/src/qml/configure.cmake
+++ b/src/qml/configure.cmake
@@ -13,6 +13,7 @@
 # cxx14_make_unique
 qt_config_compile_test(cxx14_make_unique
     LABEL "C++14 make_unique()"
+    CODE
 "
 #include <memory>
 
@@ -29,6 +30,7 @@ std::unique_ptr<int> ptr = std::make_unique<int>();
 # pointer_32bit
 qt_config_compile_test(pointer_32bit
     LABEL "32bit pointers"
+    CODE
 "
 
 
@@ -45,6 +47,7 @@ static_assert(sizeof(void *) == 4, \"fail\");
 # pointer_64bit
 qt_config_compile_test(pointer_64bit
     LABEL "64bit pointers"
+    CODE
 "
 
 
@@ -61,6 +64,7 @@ static_assert(sizeof(void *) == 8, \"fail\");
 # arm_thumb
 qt_config_compile_test(arm_thumb
     LABEL "THUMB mode on ARM"
+    CODE
 "
 
 
@@ -86,6 +90,7 @@ int main(int argc, char **argv)
 # arm_fp
 qt_config_compile_test(arm_fp
     LABEL "Sufficiently recent FPU on ARM"
+    CODE
 "
 
 
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index 9cfafd677d..f0896e49fd 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -34,8 +34,6 @@ qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_object_model
 qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_table_model
     SOURCES
         qqmltableinstancemodel.cpp qqmltableinstancemodel_p.h
-        qqmltablemodel.cpp qqmltablemodel_p.h
-        qqmltablemodelcolumn.cpp qqmltablemodelcolumn_p.h
 )
 
 qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model
@@ -47,8 +45,8 @@ qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model
 
 qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
     SOURCES
+        qqmlabstractdelegatecomponent.cpp qqmlabstractdelegatecomponent_p.h
         qqmladaptormodel.cpp qqmladaptormodel_p.h
-        qqmldelegatecomponent.cpp qqmldelegatecomponent_p.h
         qqmldelegatemodel.cpp qqmldelegatemodel_p.h
         qqmldelegatemodel_p_p.h
         qqmllistaccessor.cpp qqmllistaccessor_p.h