diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-23 17:25:52 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-07-02 17:03:24 +0200 |
| commit | 7814e1dbfd09ead88951d95f72e71f45fd27c920 (patch) | |
| tree | 6bad033792bffbf03f7bb7611dace1358e8a0a10 /src/imports/qtqml/.prev_CMakeLists.txt | |
| parent | 974f52fc815f62868ddfe63f7391e3090f96b226 (diff) | |
Make the qtquick and qtqml plugins optional
We can do the initialization and de-initialization as constructor and
destructor functions. Then we don't need to load the plugins.
Task-number: QTBUG-84639
Change-Id: I2aeeee7e8d028555e3af91e93518c2c2afd70dbb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/imports/qtqml/.prev_CMakeLists.txt')
| -rw-r--r-- | src/imports/qtqml/.prev_CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt index 4e17431218..52e6d3e1e0 100644 --- a/src/imports/qtqml/.prev_CMakeLists.txt +++ b/src/imports/qtqml/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from qtqml.pro. set(module_dynamic_qml_imports - QtQml.Models + QtQml.Models/auto ) if (QT_FEATURE_qml_worker_script) list(APPEND module_dynamic_qml_imports - QtQml.WorkerScript + QtQml.WorkerScript/auto ) endif() @@ -21,6 +21,7 @@ qt_add_qml_module(qmlplugin CLASSNAME QtQmlPlugin SKIP_TYPE_REGISTRATION IMPORTS ${module_dynamic_qml_imports} + PLUGIN_OPTIONAL SOURCES plugin.cpp PUBLIC_LIBRARIES @@ -30,7 +31,7 @@ qt_add_qml_module(qmlplugin #### Keys ignored in scope 1:.:.:qtqml.pro:<TRUE>: # CXX_MODULE = "qml" -# DYNAMIC_QMLDIR = "module QtQml" "plugin qmlplugin" "classname QtQmlPlugin" "typeinfo plugins.qmltypes" "designersupported" "import QtQml.Models" +# DYNAMIC_QMLDIR = "module QtQml" "optional plugin qmlplugin" "classname QtQmlPlugin" "typeinfo plugins.qmltypes" "designersupported" "import QtQml.Models auto" # QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml" @@ -38,4 +39,4 @@ qt_add_qml_module(qmlplugin ##################################################################### #### Keys ignored in scope 2:.:.:qtqml.pro:QT_FEATURE_qml_worker_script: -# DYNAMIC_QMLDIR = "import QtQml.WorkerScript" +# DYNAMIC_QMLDIR = "import QtQml.WorkerScript auto" |