Merge remote-tracking branch 'origin/wip/cmake' into dev

Conflicts:
  dependencies.yaml

Change-Id: Ifff48b9d0e7962d481e63c49399e2d304e1011e5

2 files changed, 228 insertions, 0 deletions

diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ad1a578f14
--- /dev/null
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -0,0 +1,114 @@
+# Generated from qmlworkerscript.pro.
+
+#####################################################################
+## QmlWorkerScript Module:
+#####################################################################
+
+qt_add_module(QmlWorkerScript
+    GENERATE_METATYPES
+    SOURCES
+        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
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::QmlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>:
+# QMLTYPES_FILENAME = "plugins.qmltypes"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript"
+# QML_IMPORT_NAME = "QtQml.WorkerScript"
+# QML_IMPORT_VERSION = "$$QT_VERSION"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QmlWorkerScript CONDITION WIN32
+    DEFINES
+        NOMINMAX
+)
+
+qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+    DEFINES
+        WTF_USE_UDIS86=1
+)
+
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+    DEFINES
+        WTF_USE_ARMV7_DISASSEMBLER=1
+)
+
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+    DEFINES
+        WTF_USE_ARM64_DISASSEMBLER=1
+)
+
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+    DEFINES
+        WTF_USE_MIPS32_DISASSEMBLER=1
+)
+
+qt_extend_target(QmlWorkerScript CONDITION NOT disassembler
+    DEFINES
+        WTF_USE_UDIS86=0
+)
+
+qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+    DEFINES
+        NDEBUG
+)
+
+qt_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+    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"
+qt_add_docs(QmlWorkerScript
+    doc/qtqmlworkerscript.qdocconf
+)
+
+
+set_target_properties(QmlWorkerScript PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
+    QT_QML_MODULE_URI QtQml.WorkerScript
+    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript"
+)
+
+qt6_qml_type_registration(QmlWorkerScript)
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
new file mode 100644
index 0000000000..e85d1174e1
--- /dev/null
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -0,0 +1,114 @@
+# Generated from qmlworkerscript.pro.
+
+#####################################################################
+## QmlWorkerScript Module:
+#####################################################################
+
+qt_add_module(QmlWorkerScript
+    GENERATE_METATYPES
+    SOURCES
+        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
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::QmlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>:
+# QMLTYPES_FILENAME = "plugins.qmltypes"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript"
+# QML_IMPORT_NAME = "QtQml.WorkerScript"
+# QML_IMPORT_VERSION = "$$QT_VERSION"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QmlWorkerScript CONDITION WIN32
+    DEFINES
+        NOMINMAX
+)
+
+qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+    DEFINES
+        WTF_USE_UDIS86=1
+)
+
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+    DEFINES
+        WTF_USE_ARMV7_DISASSEMBLER=1
+)
+
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+    DEFINES
+        WTF_USE_ARM64_DISASSEMBLER=1
+)
+
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+    DEFINES
+        WTF_USE_MIPS32_DISASSEMBLER=1
+)
+
+qt_extend_target(QmlWorkerScript CONDITION NOT disassembler
+    DEFINES
+        WTF_USE_UDIS86=0
+)
+
+qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+    DEFINES
+        NDEBUG
+)
+
+qt_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+    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"
+qt_add_docs(QmlWorkerScript
+    doc/qtqmlworkerscript.qdocconf
+)
+
+
+set_target_properties(QmlWorkerScript PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
+    QT_QML_MODULE_URI QtQml.WorkerScript
+    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript"
+)
+
+qt6_qml_type_registration(QmlWorkerScript)