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

Regenerating and fixing as needed.

Fixes: QTBUG-90661
Change-Id: Ief9f044d4b9ea2ce8130b11031fb93b6e673fbdd

7 files changed, 126 insertions, 0 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..a80a886
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from src.pro.
+
+add_subdirectory(webchannel)
+if(TARGET Qt::Quick)
+    add_subdirectory(imports)
+endif()
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
new file mode 100644
index 0000000..6c0c9ae
--- /dev/null
+++ b/src/imports/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from imports.pro.
+
+add_subdirectory(webchannel)
diff --git a/src/imports/webchannel/.prev_CMakeLists.txt b/src/imports/webchannel/.prev_CMakeLists.txt
new file mode 100644
index 0000000..d7d2440
--- /dev/null
+++ b/src/imports/webchannel/.prev_CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from webchannel.pro.
+
+#####################################################################
+## webchannel Plugin:
+#####################################################################
+
+qt_internal_add_qml_module(webchannel
+    URI "QtWebChannel"
+    VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QWebChannelPlugin
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        plugin.cpp
+    INCLUDE_DIRECTORIES
+        ../../webchannel
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Quick
+        Qt::WebChannelPrivate
+)
+
+#### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>:
+# IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
+# TARGETPATH = "QtWebChannel"
diff --git a/src/imports/webchannel/CMakeLists.txt b/src/imports/webchannel/CMakeLists.txt
new file mode 100644
index 0000000..6a05986
--- /dev/null
+++ b/src/imports/webchannel/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from webchannel.pro.
+
+#####################################################################
+## webchannel Plugin:
+#####################################################################
+
+qt_internal_add_qml_module(webchannel
+    URI "QtWebChannel"
+    VERSION "1.0" #special case
+    CLASSNAME QWebChannelPlugin
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        plugin.cpp
+    INCLUDE_DIRECTORIES
+        ../../webchannel
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Quick
+        Qt::WebChannelPrivate
+)
+
+#### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>:
+# IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
+# TARGETPATH = "QtWebChannel"
diff --git a/src/imports/webchannel/webchannel.pro b/src/imports/webchannel/webchannel.pro
index fd69605..2141cd8 100644
--- a/src/imports/webchannel/webchannel.pro
+++ b/src/imports/webchannel/webchannel.pro
@@ -4,6 +4,7 @@ INCLUDEPATH += ../../webchannel
 VPATH += ../../webchannel
 
 IMPORT_VERSION = 1.$$QT_MINOR_VERSION
+TARGETPATH = QtWebChannel
 
 SOURCES += \
     plugin.cpp
diff --git a/src/webchannel/CMakeLists.txt b/src/webchannel/CMakeLists.txt
new file mode 100644
index 0000000..9fba217
--- /dev/null
+++ b/src/webchannel/CMakeLists.txt
@@ -0,0 +1,65 @@
+# Generated from webchannel.pro.
+
+#####################################################################
+## WebChannel Module:
+#####################################################################
+
+qt_add_module(WebChannel
+    SOURCES
+        qmetaobjectpublisher.cpp qmetaobjectpublisher_p.h
+        qwebchannel.cpp qwebchannel.h qwebchannel_p.h
+        qwebchannelabstracttransport.cpp qwebchannelabstracttransport.h
+        signalhandler_p.h
+        variantargument_p.h
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+)
+
+# Resources:
+set_source_files_properties("../../examples/webchannel/shared/qwebchannel.js"
+    PROPERTIES QT_RESOURCE_ALIAS "qwebchannel.js"
+)
+set(resources_resource_files
+    "../../examples/webchannel/shared/qwebchannel.js"
+)
+
+set_source_files_properties(${resources_resource_files} PROPERTIES QT_SKIP_QUICKCOMPILER 1)
+
+qt_add_resource(WebChannel "resources"
+    PREFIX
+        "/qtwebchannel/"
+    FILES
+        ${resources_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>:
+# OTHER_FILES = "qwebchannel.js"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(WebChannel CONDITION TARGET Qt::Qml
+    SOURCES
+        qqmlwebchannel.cpp
+        qqmlwebchannelattached.cpp
+    PUBLIC_LIBRARIES
+        Qt::Qml
+)
+
+#### Keys ignored in scope 2:.:.:webchannel.pro:TARGET Qt::Qml:
+# PRIVATE_HEADERS = "qqmlwebchannelattached_p.h"
+# PUBLIC_HEADERS = "qqmlwebchannel.h"
+
+qt_extend_target(WebChannel CONDITION NOT TARGET Qt::Qml
+    DEFINES
+        QT_NO_JSVALUE
+)
+qt_add_docs(WebChannel
+    doc/qtwebchannel.qdocconf
+)
+
diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro
index 9c555e7..00e75f5 100644
--- a/src/webchannel/webchannel.pro
+++ b/src/webchannel/webchannel.pro
@@ -7,6 +7,9 @@ QMAKE_DOCS = $$PWD/doc/qtwebchannel.qdocconf
 RESOURCES += \
     resources.qrc
 
+QTQUICK_COMPILER_SKIPPED_RESOURCES += \
+    resources.qrc
+
 OTHER_FILES = \
     qwebchannel.js