diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-03 14:08:25 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-05 16:32:47 +0200 |
| commit | ddca4b63375a42a0852f8e470d5c5fabdabd9321 (patch) | |
| tree | 93a758dd6ca884b8f6bc48e17d65aa321a4540fb | |
| parent | e8273b6faf7f93240fdb507dac9a4e68847b6469 (diff) | |
Port to new CMake API
This is a low-risk port to the new CMake API. It leaves all the
procedural registration intact and just uses the new CMake syntax.
Change-Id: I9162b905afb510b7403ef6eb61b46b01325e7b72
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/imports/opcua/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | src/imports/opcua/plugin.json | 2 | ||||
| -rw-r--r-- | src/imports/opcua/qmldir | 4 |
3 files changed, 12 insertions, 26 deletions
diff --git a/src/imports/opcua/CMakeLists.txt b/src/imports/opcua/CMakeLists.txt index 44fb252..faa7b91 100644 --- a/src/imports/opcua/CMakeLists.txt +++ b/src/imports/opcua/CMakeLists.txt @@ -1,17 +1,15 @@ -# Generated from opcua.pro. - -##################################################################### -## opcua Plugin: -##################################################################### - -qt_internal_add_qml_module(declarative_opcua # special case - VERSION "1.0" - CLASSNAME OpcUaPlugin - SKIP_TYPE_REGISTRATION -# special case begin - URI - QtOpcUa -# special case end +qt_internal_add_qml_module(declarative_opcua + URI "QtOpcUa" + VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 1 5 + CLASS_NAME "OpcUaPlugin" + PLUGIN_TARGET declarative_opcua + NO_PLUGIN_OPTIONAL + NO_GENERATE_PLUGIN_SOURCE + NO_GENERATE_QMLTYPES + INSTALL_SOURCE_QMLTYPES "plugins.qmltypes" + DEPENDENCIES + QtQuick SOURCES opcua_plugin.cpp opcua_plugin.h opcuaattributecache.cpp opcuaattributecache.h @@ -49,11 +47,5 @@ qt_internal_add_qml_module(declarative_opcua # special case Qt::Quick ) -# special case begin # The file contains Q_OBJECT in a comment set_property(SOURCE opcuaconnection.cpp PROPERTY SKIP_AUTOMOC ON) -# special case end - -#### Keys ignored in scope 1:.:.:opcua.pro:<TRUE>: -# OTHER_FILES = "plugin.json" "qmldir" -# QML_IMPORT_VERSION = "1.0" diff --git a/src/imports/opcua/plugin.json b/src/imports/opcua/plugin.json deleted file mode 100644 index 2c63c08..0000000 --- a/src/imports/opcua/plugin.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/src/imports/opcua/qmldir b/src/imports/opcua/qmldir deleted file mode 100644 index 6f4d087..0000000 --- a/src/imports/opcua/qmldir +++ /dev/null @@ -1,4 +0,0 @@ -module QtOpcUa -plugin declarative_opcua -classname OpcUaPlugin -typeinfo plugins.qmltypes |