More porting of declarative modules

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

20 files changed, 760 insertions, 24 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c51bd3c502..b1795ebafc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,37 +2,37 @@
 
 add_subdirectory(qml)
 add_subdirectory(qmlmodels)
-#add_subdirectory(plugins)
+add_subdirectory(plugins)
 #add_subdirectory(imports)
 
-#if(QT_FEATURE_qml_worker_script)
-    #add_subdirectory(qmlworkerscript)
-#endif()
+if(QT_FEATURE_qml_worker_script)
+    add_subdirectory(qmlworkerscript)
+endif()
 
 if(TARGET Qt::Gui AND QT_FEATURE_qml_animation)
     add_subdirectory(quick)
-    #add_subdirectory(quickshapes)
+    add_subdirectory(quickshapes)
 
-    #if(QT_FEATURE_testlib)
-        #add_subdirectory(qmltest)
-    #endif()
+    if(QT_FEATURE_testlib AND TARGET Qt::Test) # special case
+        add_subdirectory(qmltest)
+    endif()
 
-    #if(QT_FEATURE_quick_particles)
-        #add_subdirectory(particles)
-    #endif()
+    if(QT_FEATURE_quick_particles)
+        add_subdirectory(particles)
+    endif()
 
-    #if(TARGET Qt::Widgets)
-        #add_subdirectory(quickwidgets)
-    #endif()
+    if(TARGET Qt::Widgets)
+        add_subdirectory(quickwidgets)
+    endif()
 endif()
 
-#if(QT_FEATURE_qml_devtools)
-    #add_subdirectory(qmldevtools)
-#endif()
+if(QT_FEATURE_qml_devtools)
+    add_subdirectory(qmldevtools)
+endif()
 
-#if(QT_FEATURE_qml_network)
+if(QT_FEATURE_qml_network)
 
-    #if(QT_FEATURE_thread AND QT_FEATURE_localserver AND QT_FEATURE_qml_debug)
-        #add_subdirectory(qmldebug)
-    #endif()
-#endif()
+    if(QT_FEATURE_thread AND QT_FEATURE_localserver AND QT_FEATURE_qml_debug)
+        add_subdirectory(qmldebug)
+    endif()
+endif()
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
new file mode 100644
index 0000000000..cdba8af06a
--- /dev/null
+++ b/src/particles/CMakeLists.txt
@@ -0,0 +1,101 @@
+# Generated from particles.pro.
+
+#####################################################################
+## QuickParticles Module:
+#####################################################################
+
+add_qt_module(QuickParticles
+    SOURCES
+        qquickage.cpp qquickage_p.h
+        qquickangledirection.cpp qquickangledirection_p.h
+        qquickcumulativedirection.cpp qquickcumulativedirection_p.h
+        qquickcustomaffector.cpp qquickcustomaffector_p.h
+        qquickdirection.cpp qquickdirection_p.h
+        qquickellipseextruder.cpp qquickellipseextruder_p.h
+        qquickfriction.cpp qquickfriction_p.h
+        qquickgravity.cpp qquickgravity_p.h
+        qquickgroupgoal.cpp qquickgroupgoal_p.h
+        qquickimageparticle.cpp qquickimageparticle_p.h
+        qquickitemparticle.cpp qquickitemparticle_p.h
+        qquicklineextruder.cpp qquicklineextruder_p.h
+        qquickmaskextruder.cpp qquickmaskextruder_p.h
+        qquickparticleaffector.cpp qquickparticleaffector_p.h
+        qquickparticleemitter.cpp qquickparticleemitter_p.h
+        qquickparticleextruder.cpp qquickparticleextruder_p.h
+        qquickparticlegroup.cpp qquickparticlegroup_p.h
+        qquickparticlepainter.cpp qquickparticlepainter_p.h
+        qquickparticlesmodule.cpp qquickparticlesmodule_p.h
+        qquickparticlesystem.cpp qquickparticlesystem_p.h
+        qquickpointattractor.cpp qquickpointattractor_p.h
+        qquickpointdirection.cpp qquickpointdirection_p.h
+        qquickrectangleextruder.cpp qquickrectangleextruder_p.h
+        qquickspritegoal.cpp qquickspritegoal_p.h
+        qquicktargetdirection.cpp qquicktargetdirection_p.h
+        qquicktrailemitter.cpp qquicktrailemitter_p.h
+        qquickturbulence.cpp qquickturbulence_p.h
+        qquickv4particledata.cpp qquickv4particledata_p.h
+        qquickwander.cpp qquickwander_p.h
+        qtquickparticlesglobal_p.h
+    DEFINES
+        QT_NO_INTEGER_EVENT_COORDINATES
+        QT_NO_URL_CAST_FROM_STRING
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
+
+# Resources:
+add_qt_resource(QuickParticles "particles" PREFIX "/" FILES
+    particleresources/fuzzydot.png
+    particleresources/glowdot.png
+    particleresources/noise.png
+    particleresources/star.png)
+add_qt_resource(QuickParticles "particles1" PREFIX "/particles" FILES
+    shaders/customparticle.frag
+    shaders/customparticle.vert
+    shaders/customparticle_core.frag
+    shaders/customparticle_core.vert
+    shaders/customparticletemplate.vert
+    shaders/customparticletemplate_core.vert
+    shaders/imageparticle.frag
+    shaders/imageparticle.vert
+    shaders/imageparticle_core.frag
+    shaders/imageparticle_core.vert)
+
+
+#### Keys ignored in scope 1:.:.:particles.pro:<TRUE>:
+# CONFIG = "internal_module"
+# MODULE = "quickparticles"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(QuickParticles CONDITION MSVC
+    DEFINES
+        _CRT_SECURE_NO_WARNINGS
+)
+
+#### Keys ignored in scope 3:.:.:particles.pro:solaris-cc_x_:
+# QMAKE_CXXFLAGS_RELEASE = "--O2"
+
+extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
+    LIBRARIES
+        gcov
+    COMPILE_OPTIONS
+        -fno-elide-constructors
+        -fprofile-arcs
+        -ftest-coverage
+)
+
+extend_target(QuickParticles CONDITION QT_FEATURE_quick_shadereffect
+    SOURCES
+        qquickcustomparticle.cpp qquickcustomparticle_p.h
+)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
new file mode 100644
index 0000000000..805cddf62d
--- /dev/null
+++ b/src/plugins/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from plugins.pro.
+
+
+if(QT_FEATURE_thread AND QT_FEATURE_qml_debug)
+    add_subdirectory(qmltooling)
+endif()
+
+if(TARGET Qt::Quick)
+    add_subdirectory(scenegraph)
+endif()
diff --git a/src/plugins/qmltooling/CMakeLists.txt b/src/plugins/qmltooling/CMakeLists.txt
new file mode 100644
index 0000000000..61f73e6705
--- /dev/null
+++ b/src/plugins/qmltooling/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from qmltooling.pro.
+
+add_subdirectory(packetprotocol)
+#add_subdirectory(qmldbg_native)
+#add_subdirectory(qmldbg_messages)
+#add_subdirectory(qmldbg_profiler)
+#add_subdirectory(qmldbg_debugger)
+#add_subdirectory(qmldbg_nativedebugger)
+
+#if(QT_FEATURE_thread)
+    #add_subdirectory(qmldbg_server)
+#endif()
+
+#if(QT_FEATURE_qml_network)
+    #add_subdirectory(qmldbg_tcp)
+
+    #if(QT_FEATURE_localserver)
+        #add_subdirectory(qmldbg_local)
+    #endif()
+#endif()
+
+#if(TARGET Qt::Quick)
+    #add_subdirectory(qmldbg_inspector)
+    #add_subdirectory(qmldbg_quickprofiler)
+
+    #if(QT_FEATURE_qml_network)
+        #add_subdirectory(qmldbg_preview)
+    #endif()
+#endif()
diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
new file mode 100644
index 0000000000..d5f4174cd6
--- /dev/null
+++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from packetprotocol.pro.
+
+#####################################################################
+## PacketProtocol Module:
+#####################################################################
+
+add_qt_module(PacketProtocol
+    STATIC
+    SOURCES
+        qpacket.cpp qpacket_p.h
+        qpacketprotocol.cpp qpacketprotocol_p.h
+        qversionedpacket_p.h
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:packetprotocol.pro:<TRUE>:
+# CONFIG = "static" "internal_module"
+# _LOADED = "qt_module"
diff --git a/src/plugins/scenegraph/CMakeLists.txt b/src/plugins/scenegraph/CMakeLists.txt
new file mode 100644
index 0000000000..c490b19293
--- /dev/null
+++ b/src/plugins/scenegraph/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from scenegraph.pro.
+
+
+#if(QT_FEATURE_d3d12)
+#    add_subdirectory(d3d12)
+#endif()
+
+if(QT_FEATURE_openvg)
+    add_subdirectory(openvg)
+endif()
diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt
new file mode 100644
index 0000000000..39e28e047c
--- /dev/null
+++ b/src/plugins/scenegraph/openvg/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Generated from openvg.pro.
+
+#####################################################################
+## qsgopenvgbackend Plugin:
+#####################################################################
+
+add_qt_plugin(qsgopenvgbackend
+    TYPE scenegraph
+    CLASS_NAME QSGOpenVGAdaptation
+    SOURCES
+        qopenvgcontext.cpp qopenvgcontext_p.h
+        qopenvgmatrix.cpp qopenvgmatrix.h
+        qopenvgoffscreensurface.cpp qopenvgoffscreensurface.h
+        qsgopenvgadaptation.cpp qsgopenvgadaptation_p.h
+        qsgopenvgcontext.cpp qsgopenvgcontext_p.h
+        qsgopenvgfontglyphcache.cpp qsgopenvgfontglyphcache.h
+        qsgopenvgglyphnode.cpp qsgopenvgglyphnode_p.h
+        qsgopenvghelpers.cpp qsgopenvghelpers.h
+        qsgopenvginternalimagenode.cpp qsgopenvginternalimagenode.h
+        qsgopenvginternalrectanglenode.cpp qsgopenvginternalrectanglenode.h
+        qsgopenvglayer.cpp qsgopenvglayer.h
+        qsgopenvgnodevisitor.cpp qsgopenvgnodevisitor.h
+        qsgopenvgpainternode.cpp qsgopenvgpainternode.h
+        qsgopenvgpublicnodes.cpp qsgopenvgpublicnodes.h
+        qsgopenvgrenderable.cpp qsgopenvgrenderable.h
+        qsgopenvgrenderer.cpp qsgopenvgrenderer_p.h
+        qsgopenvgrenderloop.cpp qsgopenvgrenderloop_p.h
+        qsgopenvgtexture.cpp qsgopenvgtexture.h
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+        openvg
+)
+
+#### Keys ignored in scope 1:.:.:openvg.pro:<TRUE>:
+# CONFIG = "egl"
+# OTHER_FILES = "$$PWD/openvg.json"
+# PLUGIN_CLASS_NAME = "QSGOpenVGAdaptation"
+# PLUGIN_TYPE = "scenegraph"
+# QMAKE_TARGET_DESCRIPTION = "Quick OpenVG Renderer for Qt."
+# QMAKE_TARGET_PRODUCT = "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)"
+# _LOADED = "qt_plugin"
+
+## Scopes:
+#####################################################################
+
+extend_target(qsgopenvgbackend CONDITION QT_FEATURE_quick_sprite
+    SOURCES
+        qsgopenvgspritenode.cpp qsgopenvgspritenode.h
+)
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index 32595a1759..077373f9ac 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 add_qt_module(Qml
+    PLUGIN_TYPES qmltooling
     SOURCES
         ../3rdparty/llvm/include/llvm-c/DataTypes.h
         ../3rdparty/llvm/include/llvm/ADT/PointerIntPair.h
@@ -593,3 +594,4 @@ qt_create_tracepoints(Qml qtqml.tracepoints)
 add_qt_docs(
     doc/qtqml.qdocconf
 )
+
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index b91862edd4..6a750161f4 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 add_qt_module(Qml
+    PLUGIN_TYPES qmltooling
     SOURCES
         ../3rdparty/llvm/include/llvm-c/DataTypes.h
         ../3rdparty/llvm/include/llvm/ADT/PointerIntPair.h
@@ -600,3 +601,4 @@ qt_create_tracepoints(Qml qtqml.tracepoints)
 add_qt_docs(
     doc/qtqml.qdocconf
 )
+
diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
index 4ed1dbd5aa..9e77061882 100644
--- a/src/qml/jsruntime/qv4regexp.cpp
+++ b/src/qml/jsruntime/qv4regexp.cpp
@@ -74,6 +74,7 @@ DEFINE_MANAGED_VTABLE(RegExp);
 uint RegExp::match(const QString &string, int start, uint *matchOffsets)
 {
     static const uint offsetJITFail = std::numeric_limits<unsigned>::max() - 1;
+    Q_UNUSED(offsetJITFail);
 
     if (!isValid())
         return JSC::Yarr::offsetNoMatch;
diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt
new file mode 100644
index 0000000000..60f44769f2
--- /dev/null
+++ b/src/qmldebug/CMakeLists.txt
@@ -0,0 +1,43 @@
+# Generated from qmldebug.pro.
+
+#####################################################################
+## QmlDebug Module:
+#####################################################################
+
+add_qt_module(QmlDebug
+    STATIC
+    SOURCES
+        qqmldebugclient.cpp qqmldebugclient_p.h
+        qqmldebugclient_p_p.h
+        qqmldebugconnection.cpp qqmldebugconnection_p.h
+        qqmldebugmessageclient.cpp qqmldebugmessageclient_p.h
+        qqmlenginecontrolclient.cpp qqmlenginecontrolclient_p.h
+        qqmlenginecontrolclient_p_p.h
+        qqmlenginedebugclient.cpp qqmlenginedebugclient_p.h
+        qqmlenginedebugclient_p_p.h
+        qqmlinspectorclient.cpp qqmlinspectorclient_p.h
+        qqmlinspectorclient_p_p.h
+        qqmlpreviewclient.cpp qqmlpreviewclient_p.h
+        qqmlpreviewclient_p_p.h
+        qqmlprofilerclient.cpp qqmlprofilerclient_p.h
+        qqmlprofilerclient_p_p.h
+        qqmlprofilerclientdefinitions_p.h
+        qqmlprofilerevent.cpp qqmlprofilerevent_p.h
+        qqmlprofilereventlocation.cpp qqmlprofilereventlocation_p.h
+        qqmlprofilereventreceiver_p.h
+        qqmlprofilereventtype.cpp qqmlprofilereventtype_p.h
+        qqmlprofilertypedevent.cpp qqmlprofilertypedevent_p.h
+        qv4debugclient.cpp qv4debugclient_p.h
+        qv4debugclient_p_p.h
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::PacketProtocolPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Network
+        Qt::PacketProtocol
+)
+
+#### Keys ignored in scope 1:.:.:qmldebug.pro:<TRUE>:
+# CONFIG = "static" "internal_module"
+# _LOADED = "qt_module"
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c868dff329
--- /dev/null
+++ b/src/qmldevtools/.prev_CMakeLists.txt
@@ -0,0 +1,67 @@
+# Generated from qmldevtools.pro.
+
+#####################################################################
+## QmlDevTools Module:
+#####################################################################
+
+add_qt_module(QmlDevTools
+    NO_SYNC_QT
+    SOURCES
+        ../qml/compiler/qqmlirbuilder.cpp ../qml/compiler/qqmlirbuilder_p.h
+        ../qml/compiler/qv4alloca_p.h
+        ../qml/compiler/qv4bytecodegenerator.cpp ../qml/compiler/qv4bytecodegenerator_p.h
+        ../qml/compiler/qv4bytecodehandler.cpp ../qml/compiler/qv4bytecodehandler_p.h
+        ../qml/compiler/qv4calldata_p.h
+        ../qml/compiler/qv4codegen.cpp ../qml/compiler/qv4codegen_p.h
+        ../qml/compiler/qv4compileddata.cpp ../qml/compiler/qv4compileddata_p.h
+        ../qml/compiler/qv4compiler.cpp ../qml/compiler/qv4compiler_p.h
+        ../qml/compiler/qv4compilercontext.cpp ../qml/compiler/qv4compilercontext_p.h
+        ../qml/compiler/qv4compilercontrolflow_p.h
+        ../qml/compiler/qv4compilerscanfunctions.cpp ../qml/compiler/qv4compilerscanfunctions_p.h
+        ../qml/compiler/qv4instr_moth.cpp ../qml/compiler/qv4instr_moth_p.h
+        ../qml/compiler/qv4staticvalue_p.h
+        ../qml/compiler/qv4stringtoarrayindex_p.h
+        ../qml/compiler/qv4util_p.h
+        ../qml/parser/qqmljsast.cpp ../qml/parser/qqmljsast_p.h
+        ../qml/parser/qqmljsastfwd_p.h
+        ../qml/parser/qqmljsastvisitor.cpp ../qml/parser/qqmljsastvisitor_p.h
+        ../qml/parser/qqmljsengine_p.cpp ../qml/parser/qqmljsengine_p.h ../qml/parser/qqmljsengine_p.h
+        ../qml/parser/qqmljsglobal_p.h ../qml/parser/qqmljsglobal_p.h
+        ../qml/parser/qqmljskeywords_p.h
+        ../qml/parser/qqmljslexer.cpp ../qml/parser/qqmljslexer_p.h
+        ../qml/parser/qqmljsmemorypool_p.h
+        ../qml/parser/qqmljssourcelocation_p.h
+        ../qml/qmldirparser/qqmldirparser.cpp ../qml/qmldirparser/qqmldirparser_p.h
+        ../qml/qmldirparser/qqmlerror.cpp ../qml/qmldirparser/qqmlerror.h
+        ../qml/qmldirparser/qqmlsourcecoordinate_p.h
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_BUILD_DIR}/../qml
+        ${CMAKE_CURRENT_BUILD_DIR}/../qml/compiler
+        ${CMAKE_CURRENT_BUILD_DIR}/../qml/qmldirparser
+        ../qml/compiler
+        ../qml/qmldirparser
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>:
+# CONFIG = "minimal_syncqt" "internal_module" "generated_privates" "qlalr"
+# MODULE_INCNAME = "QtQml"
+# _LOADED = "qt_module"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qmldevtools.pro:ICC:
+# WERROR = "-ww2415"
+
+#### Keys ignored in scope 3:.:.:qmldevtools.pro:CLANG AND greaterThan(QT_CLANG_MAJOR_VERSION,3 OR greaterThan(QT_CLANG_MINOR_VERSION,3)):
+# WERROR = "-Wno-error=unused-const-variable"
+
+extend_target(QmlDevTools CONDITION (GCC) AND ((QT_COMPILER_VERSION_MAJOR STREQUAL 5))
+    COMPILE_OPTIONS
+        -fno-strict-aliasing
+)
diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt
new file mode 100644
index 0000000000..5ac189074e
--- /dev/null
+++ b/src/qmldevtools/CMakeLists.txt
@@ -0,0 +1,69 @@
+# Generated from qmldevtools.pro.
+
+#####################################################################
+## QmlDevTools Module:
+#####################################################################
+
+add_qt_module(QmlDevTools
+    NO_SYNC_QT
+    SOURCES
+        ../qml/compiler/qqmlirbuilder.cpp ../qml/compiler/qqmlirbuilder_p.h
+        ../qml/compiler/qv4alloca_p.h
+        ../qml/compiler/qv4bytecodegenerator.cpp ../qml/compiler/qv4bytecodegenerator_p.h
+        ../qml/compiler/qv4bytecodehandler.cpp ../qml/compiler/qv4bytecodehandler_p.h
+        ../qml/compiler/qv4calldata_p.h
+        ../qml/compiler/qv4codegen.cpp ../qml/compiler/qv4codegen_p.h
+        ../qml/compiler/qv4compileddata.cpp ../qml/compiler/qv4compileddata_p.h
+        ../qml/compiler/qv4compiler.cpp ../qml/compiler/qv4compiler_p.h
+        ../qml/compiler/qv4compilercontext.cpp ../qml/compiler/qv4compilercontext_p.h
+        ../qml/compiler/qv4compilercontrolflow_p.h
+        ../qml/compiler/qv4compilerscanfunctions.cpp ../qml/compiler/qv4compilerscanfunctions_p.h
+        ../qml/compiler/qv4instr_moth.cpp ../qml/compiler/qv4instr_moth_p.h
+        ../qml/compiler/qv4staticvalue_p.h
+        ../qml/compiler/qv4stringtoarrayindex_p.h
+        ../qml/compiler/qv4util_p.h
+        ../qml/parser/qqmljsast.cpp ../qml/parser/qqmljsast_p.h
+        ../qml/parser/qqmljsastfwd_p.h
+        ../qml/parser/qqmljsastvisitor.cpp ../qml/parser/qqmljsastvisitor_p.h
+        ../qml/parser/qqmljsengine_p.cpp ../qml/parser/qqmljsengine_p.h ../qml/parser/qqmljsengine_p.h
+        ../qml/parser/qqmljsglobal_p.h ../qml/parser/qqmljsglobal_p.h
+        ../qml/parser/qqmljskeywords_p.h
+        ../qml/parser/qqmljslexer.cpp ../qml/parser/qqmljslexer_p.h
+        ../qml/parser/qqmljsmemorypool_p.h
+        ../qml/parser/qqmljssourcelocation_p.h
+        ../qml/qmldirparser/qqmldirparser.cpp ../qml/qmldirparser/qqmldirparser_p.h
+        ../qml/qmldirparser/qqmlerror.cpp ../qml/qmldirparser/qqmlerror.h
+        ../qml/qmldirparser/qqmlsourcecoordinate_p.h
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_BUILD_DIR}/../qml
+        ${CMAKE_CURRENT_BUILD_DIR}/../qml/compiler
+        ${CMAKE_CURRENT_BUILD_DIR}/../qml/qmldirparser
+        ../qml/compiler
+        ../qml/qmldirparser
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::QmlPrivate # special case
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Qml # special case
+)
+
+#### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>:
+# CONFIG = "minimal_syncqt" "internal_module" "generated_privates" "qlalr"
+# MODULE_INCNAME = "QtQml"
+# _LOADED = "qt_module"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qmldevtools.pro:ICC:
+# WERROR = "-ww2415"
+
+#### Keys ignored in scope 3:.:.:qmldevtools.pro:CLANG AND greaterThan(QT_CLANG_MAJOR_VERSION,3 OR greaterThan(QT_CLANG_MINOR_VERSION,3)):
+# WERROR = "-Wno-error=unused-const-variable"
+
+extend_target(QmlDevTools CONDITION (GCC) AND ((QT_COMPILER_VERSION_MAJOR STREQUAL 5))
+    COMPILE_OPTIONS
+        -fno-strict-aliasing
+)
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
new file mode 100644
index 0000000000..b5d8a61d45
--- /dev/null
+++ b/src/qmltest/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from qmltest.pro.
+
+#####################################################################
+## QuickTest Module:
+#####################################################################
+
+add_qt_module(QuickTest
+    QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG}
+    SOURCES
+        qtestoptions_p.h
+        quicktest.cpp quicktest.h
+        quicktestevent.cpp quicktestevent_p.h
+        quicktestglobal.h
+        quicktestresult.cpp quicktestresult_p.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_URL_CAST_FROM_STRING
+    LIBRARIES
+        Qt::TestPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>:
+# MODULE_CONFIG = "$${QT.testlib.CONFIG}"
+# QT_PRIVATE = "quick" "quick-private" "qml-private" "gui" "core-private" "gui-private"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(QuickTest CONDITION TARGET Qt::Widgets
+    DEFINES
+        QT_QMLTEST_WITH_WIDGETS
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
+extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
+    DEFINES
+        QT_QML_DEBUG_NO_WARNING
+)
+add_qt_docs(
+    doc/qtqmltest.qdocconf
+)
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7289ad9d11
--- /dev/null
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -0,0 +1,95 @@
+# Generated from qmlworkerscript.pro.
+
+#####################################################################
+## QmlWorkerScript Module:
+#####################################################################
+
+add_qt_module(QmlWorkerScript
+    SOURCES
+        qqmlworkerscriptmodule.cpp qqmlworkerscriptmodule_p.h
+        qquickworkerscript.cpp qquickworkerscript_p.h
+        qtqmlworkerscriptglobal.h qtqmlworkerscriptglobal_p.h
+        qv4serialize.cpp qv4serialize_p.h
+    DEFINES
+        BUILDING_QT__
+        ENABLE_ASSEMBLER_WX_EXCLUSIVE=1
+        ENABLE_DFG_JIT=0
+        ENABLE_DFG_JIT_UTILITY_METHODS=1
+        ENABLE_JIT_CONSTANT_BLINDING=0
+        ENABLE_LLINT=0
+        JS_EXPORT_PRIVATE=""
+        QT_NO_FOREACH
+        QT_NO_INTEGER_EVENT_COORDINATES
+        QT_NO_URL_CAST_FROM_STRING
+        WTFInvokeCrashHook=qmlWTFInvokeCrashHook
+        WTFReportAssertionFailure=qmlWTFReportAssertionFailure
+        WTFReportAssertionFailureWithMessage=qmlWTFReportAssertionFailureWithMessage
+        WTFReportBacktrace=qmlWTFReportBacktrace
+        WTF_EXPORT_PRIVATE=""
+    INCLUDE_DIRECTORIES
+        ../3rdparty/masm
+        ../3rdparty/masm/assembler
+        ../3rdparty/masm/disassembler
+        ../3rdparty/masm/disassembler/udis86
+        ../3rdparty/masm/jit
+        ../3rdparty/masm/runtime
+        ../3rdparty/masm/stubs
+        ../3rdparty/masm/stubs/runtime
+        ../3rdparty/masm/stubs/wtf
+        ../3rdparty/masm/wtf
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::QmlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Qml
+)
+
+#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>:
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(QmlWorkerScript CONDITION WIN32
+    DEFINES
+        NOMINMAX
+)
+
+extend_target(QmlWorkerScript CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386")" OR isEqual(QT_ARCH,"x86_64))
+    DEFINES
+        WTF_USE_UDIS86=1
+)
+
+extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+    DEFINES
+        WTF_USE_ARMV7_DISASSEMBLER=1
+)
+
+extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+    DEFINES
+        WTF_USE_ARM64_DISASSEMBLER=1
+)
+
+extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+    DEFINES
+        WTF_USE_MIPS32_DISASSEMBLER=1
+)
+
+extend_target(QmlWorkerScript CONDITION NOT disassembler
+    DEFINES
+        WTF_USE_UDIS86=0
+)
+
+extend_target(QmlWorkerScript CONDITION (CMAKE_BUILD_TYPE STREQUAL Release)
+    DEFINES
+        NDEBUG
+)
+
+extend_target(QmlWorkerScript CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6))
+    COMPILE_OPTIONS
+        -Wno-expansion-to-defined
+)
+
+#### 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"
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
new file mode 100644
index 0000000000..4c8aa17f59
--- /dev/null
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -0,0 +1,95 @@
+# Generated from qmlworkerscript.pro.
+
+#####################################################################
+## QmlWorkerScript Module:
+#####################################################################
+
+add_qt_module(QmlWorkerScript
+    SOURCES
+        qqmlworkerscriptmodule.cpp qqmlworkerscriptmodule_p.h
+        qquickworkerscript.cpp qquickworkerscript_p.h
+        qtqmlworkerscriptglobal.h qtqmlworkerscriptglobal_p.h
+        qv4serialize.cpp qv4serialize_p.h
+    DEFINES
+        BUILDING_QT__
+        ENABLE_ASSEMBLER_WX_EXCLUSIVE=1
+        ENABLE_DFG_JIT=0
+        ENABLE_DFG_JIT_UTILITY_METHODS=1
+        ENABLE_JIT_CONSTANT_BLINDING=0
+        ENABLE_LLINT=0
+        JS_EXPORT_PRIVATE= # special case
+        QT_NO_FOREACH
+        QT_NO_INTEGER_EVENT_COORDINATES
+        QT_NO_URL_CAST_FROM_STRING
+        WTFInvokeCrashHook=qmlWTFInvokeCrashHook
+        WTFReportAssertionFailure=qmlWTFReportAssertionFailure
+        WTFReportAssertionFailureWithMessage=qmlWTFReportAssertionFailureWithMessage
+        WTFReportBacktrace=qmlWTFReportBacktrace
+        WTF_EXPORT_PRIVATE= # special case
+    INCLUDE_DIRECTORIES
+        ../3rdparty/masm
+        ../3rdparty/masm/assembler
+        ../3rdparty/masm/disassembler
+        ../3rdparty/masm/disassembler/udis86
+        ../3rdparty/masm/jit
+        ../3rdparty/masm/runtime
+        ../3rdparty/masm/stubs
+        ../3rdparty/masm/stubs/runtime
+        ../3rdparty/masm/stubs/wtf
+        ../3rdparty/masm/wtf
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::QmlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Qml
+)
+
+#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>:
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(QmlWorkerScript CONDITION WIN32
+    DEFINES
+        NOMINMAX
+)
+
+extend_target(QmlWorkerScript CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) # special case
+    DEFINES
+        WTF_USE_UDIS86=1
+)
+
+extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+    DEFINES
+        WTF_USE_ARMV7_DISASSEMBLER=1
+)
+
+extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+    DEFINES
+        WTF_USE_ARM64_DISASSEMBLER=1
+)
+
+extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+    DEFINES
+        WTF_USE_MIPS32_DISASSEMBLER=1
+)
+
+extend_target(QmlWorkerScript CONDITION NOT disassembler
+    DEFINES
+        WTF_USE_UDIS86=0
+)
+
+extend_target(QmlWorkerScript CONDITION (CMAKE_BUILD_TYPE STREQUAL Release)
+    DEFINES
+        NDEBUG
+)
+
+extend_target(QmlWorkerScript CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6))
+    COMPILE_OPTIONS
+        -Wno-expansion-to-defined
+)
+
+#### 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"
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index f375b56657..fa9a08bbda 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 add_qt_module(Quick
+    PLUGIN_TYPES scenegraph
     SOURCES
         handlers/qquickdragaxis.cpp handlers/qquickdragaxis_p.h
         handlers/qquickdraghandler.cpp handlers/qquickdraghandler_p.h
@@ -498,3 +499,4 @@ extend_target(Quick CONDITION QT_FEATURE_wheelevent
 add_qt_docs(
     doc/qtquick.qdocconf
 )
+
diff --git a/src/quick/configure.cmake b/src/quick/configure.cmake
index 556bff62d0..24b8b9f39e 100644
--- a/src/quick/configure.cmake
+++ b/src/quick/configure.cmake
@@ -24,7 +24,7 @@ qt_feature("quick_animatedimage" PRIVATE
     SECTION "Qt Quick"
     LABEL "AnimatedImage item"
     PURPOSE "Provides the AnimatedImage item."
-    CONDITION module.gui AND QT_FEATURE_movie OR FIXME
+    CONDITION TARGET Qt::Gui AND QT_FEATURE_movie
 )
 qt_feature("quick_canvas" PRIVATE
     SECTION "Qt Quick"
@@ -72,7 +72,7 @@ qt_feature("quick_particles" PRIVATE
     SECTION "Qt Quick"
     LABEL "Particle support"
     PURPOSE "Provides a particle system."
-    CONDITION module.gui AND QT_FEATURE_quick_shadereffect AND QT_FEATURE_quick_sprite AND QT_FEATURE_opengl OR FIXME
+    CONDITION TARGET Qt::Gui AND QT_FEATURE_quick_shadereffect AND QT_FEATURE_quick_sprite AND QT_FEATURE_opengl
 )
 qt_feature("quick_path" PRIVATE
     SECTION "Qt Quick"
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
new file mode 100644
index 0000000000..bad619a806
--- /dev/null
+++ b/src/quickshapes/CMakeLists.txt
@@ -0,0 +1,56 @@
+# Generated from quickshapes.pro.
+
+#####################################################################
+## QuickShapes Module:
+#####################################################################
+
+add_qt_module(QuickShapes
+    SOURCES
+        qquickshape.cpp qquickshape_p.h
+        qquickshape_p_p.h
+        qquickshapegenericrenderer.cpp qquickshapegenericrenderer_p.h
+        qquickshapesglobal.h qquickshapesglobal_p.h
+        qquickshapesoftwarerenderer.cpp qquickshapesoftwarerenderer_p.h
+    LIBRARIES
+        Qt::GuiPrivate
+        Qt::QuickPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
+
+# Resources:
+add_qt_resource(QuickShapes "qtquickshapes" PREFIX "/qt-project.org/shapes" FILES
+    shaders/blit.frag
+    shaders/blit.vert
+    shaders/blit_core.frag
+    shaders/blit_core.vert
+    shaders/conicalgradient.frag
+    shaders/conicalgradient.vert
+    shaders/conicalgradient_core.frag
+    shaders/conicalgradient_core.vert
+    shaders/lineargradient.frag
+    shaders/lineargradient.vert
+    shaders/lineargradient_core.frag
+    shaders/lineargradient_core.vert
+    shaders/radialgradient.frag
+    shaders/radialgradient.vert
+    shaders/radialgradient_core.frag
+    shaders/radialgradient_core.vert)
+
+
+#### Keys ignored in scope 1:.:.:quickshapes.pro:<TRUE>:
+# CONFIG = "simd" "optimize_full" "internal_module"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(QuickShapes CONDITION QT_FEATURE_opengl
+    SOURCES
+        qquicknvprfunctions.cpp qquicknvprfunctions_p.h
+        qquicknvprfunctions_p_p.h
+        qquickshapenvprrenderer.cpp qquickshapenvprrenderer_p.h
+)
diff --git a/src/quickwidgets/CMakeLists.txt b/src/quickwidgets/CMakeLists.txt
new file mode 100644
index 0000000000..a1df766eb2
--- /dev/null
+++ b/src/quickwidgets/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from quickwidgets.pro.
+
+#####################################################################
+## QuickWidgets Module:
+#####################################################################
+
+add_qt_module(QuickWidgets
+    SOURCES
+        qquickwidget.cpp qquickwidget.h qquickwidget_p.h
+        qtquickwidgetsglobal.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_INTEGER_EVENT_COORDINATES
+        QT_NO_URL_CAST_FROM_STRING
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:quickwidgets.pro:<TRUE>:
+# _LOADED = "qt_module"