aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/sharedimage
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/sharedimage')
-rw-r--r--src/imports/sharedimage/plugin.cpp14
-rw-r--r--src/imports/sharedimage/plugins.qmltypes11
-rw-r--r--src/imports/sharedimage/sharedimage.pro1
3 files changed, 8 insertions, 18 deletions
diff --git a/src/imports/sharedimage/plugin.cpp b/src/imports/sharedimage/plugin.cpp
index b75e38e303..d7c2ef8d17 100644
--- a/src/imports/sharedimage/plugin.cpp
+++ b/src/imports/sharedimage/plugin.cpp
@@ -99,19 +99,19 @@
The shared image module does not provide any directly usable QML types.
*/
+extern void qml_register_types_Qt_labs_sharedimage();
+
QT_BEGIN_NAMESPACE
-class QtQuickSharedImagePlugin : public QQmlExtensionPlugin
+class QtQuickSharedImagePlugin : public QQmlEngineExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+ Q_PLUGIN_METADATA(IID QQmlEngineExtensionInterface_iid)
public:
- QtQuickSharedImagePlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) {}
-
- void registerTypes(const char *uri) override
+ QtQuickSharedImagePlugin(QObject *parent = nullptr) : QQmlEngineExtensionPlugin(parent)
{
- Q_ASSERT(uri == QStringLiteral("Qt.labs.sharedimage"));
- qmlRegisterModule(uri, 1, 0);
+ volatile auto registration = &qml_register_types_Qt_labs_sharedimage;
+ Q_UNUSED(registration);
}
void initializeEngine(QQmlEngine *engine, const char *uri) override
diff --git a/src/imports/sharedimage/plugins.qmltypes b/src/imports/sharedimage/plugins.qmltypes
deleted file mode 100644
index 29639e7697..0000000000
--- a/src/imports/sharedimage/plugins.qmltypes
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick.tooling 1.2
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable Qt.labs.sharedimage 1.0'
-
-Module {
- dependencies: ["QtQuick 2.0"]
-}
diff --git a/src/imports/sharedimage/sharedimage.pro b/src/imports/sharedimage/sharedimage.pro
index 46a6a56ca5..8ab4f10405 100644
--- a/src/imports/sharedimage/sharedimage.pro
+++ b/src/imports/sharedimage/sharedimage.pro
@@ -14,4 +14,5 @@ HEADERS += \
sharedimageprovider.h \
qsharedimageloader_p.h
+CONFIG += qmltypes install_qmltypes
load(qml_plugin)