summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-06-03 14:59:11 +0200
committerUlf Hermann <ulf.hermann@qt.io>2021-06-05 09:02:37 +0200
commit01caba1b0af8273887d1be82e6644d34cf30bba0 (patch)
treef176fdc659b105b67e315d7b99e98838565ce3eb /src
parent03cc00e4d42504e1198f38a1eb434aba7631481c (diff)
downloadqtwebsockets-01caba1b0af8273887d1be82e6644d34cf30bba0.tar.gz
Port to new CMake API for QML
Do a purely syntactical conversion that leaves all the old code intact. Porting to declarative type registration etc shall be done in a separate step. Change-Id: I8322efe8160f2d6761817cb89d5369b15a63a952 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/qmlwebsockets/CMakeLists.txt21
-rw-r--r--src/imports/qmlwebsockets/dependencies.json2
-rw-r--r--src/imports/qmlwebsockets/qmldir4
3 files changed, 8 insertions, 19 deletions
diff --git a/src/imports/qmlwebsockets/CMakeLists.txt b/src/imports/qmlwebsockets/CMakeLists.txt
index 9f1b0ab..06316bf 100644
--- a/src/imports/qmlwebsockets/CMakeLists.txt
+++ b/src/imports/qmlwebsockets/CMakeLists.txt
@@ -1,14 +1,13 @@
-# Generated from qmlwebsockets.pro.
-
-#####################################################################
-## qmlwebsockets Plugin:
-#####################################################################
-
qt_internal_add_qml_module(qmlwebsockets
URI "QtWebSockets"
- VERSION "1.0" #special case
- CLASSNAME QtWebSocketsDeclarativeModule
- SKIP_TYPE_REGISTRATION
+ VERSION "${PROJECT_VERSION}"
+ PAST_MAJOR_VERSIONS 1
+ CLASS_NAME QtWebSocketsDeclarativeModule
+ PLUGIN_TARGET qmlwebsockets
+ NO_PLUGIN_OPTIONAL
+ NO_GENERATE_PLUGIN_SOURCE
+ NO_GENERATE_QMLTYPES
+ INSTALL_SOURCE_QMLTYPES "plugins.qmltypes"
SOURCES
qmlwebsockets_plugin.cpp qmlwebsockets_plugin.h
qqmlwebsocket.cpp qqmlwebsocket.h
@@ -19,7 +18,3 @@ qt_internal_add_qml_module(qmlwebsockets
Qt::WebSockets
)
-#### Keys ignored in scope 1:.:.:qmlwebsockets.pro:<TRUE>:
-# IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir"
-# TARGETPATH = "QtWebSockets"
diff --git a/src/imports/qmlwebsockets/dependencies.json b/src/imports/qmlwebsockets/dependencies.json
deleted file mode 100644
index 0d4f101..0000000
--- a/src/imports/qmlwebsockets/dependencies.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/src/imports/qmlwebsockets/qmldir b/src/imports/qmlwebsockets/qmldir
deleted file mode 100644
index 130b79f..0000000
--- a/src/imports/qmlwebsockets/qmldir
+++ /dev/null
@@ -1,4 +0,0 @@
-module QtWebSockets
-plugin declarative_qmlwebsockets
-classname QtWebSocketsDeclarativeModule
-typeinfo plugins.qmltypes