diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-27 01:00:58 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-27 13:08:12 +0200 |
| commit | 1ce1e39b1c9334413473691a218ab4240fba01e1 (patch) | |
| tree | 02a8ff6ab6c72cafa5cb45098bbfba4618fe83bc /src/imports/localstorage | |
| parent | 3cf5f0f6c3f1abe1d279ccae6c7563f14b31f41d (diff) | |
| parent | cc1a604c704f848927b3fa0a97b0a50b0b79d2a4 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/imports/folderlistmodel/plugin.cpp
src/imports/shapes/plugin.cpp
src/qml/qml/qqmlengine.cpp
src/qmlmodels/qqmlmodelsmodule.cpp
src/qmlworkerscript/qqmlworkerscriptmodule.cpp
src/quick/items/qquickitemsmodule.cpp
Change-Id: Ib9215a07aa95b5801ce3cb7287f7903926e8c838
Diffstat (limited to 'src/imports/localstorage')
| -rw-r--r-- | src/imports/localstorage/plugin.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 740a394fa0..6206d3ec95 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -716,6 +716,8 @@ Returns the created database object. class QQuickLocalStorage : public QObject { Q_OBJECT + QML_NAMED_ELEMENT(LocalStorage) + QML_SINGLETON public: QQuickLocalStorage(QObject *parent=nullptr) : QObject(parent) { @@ -802,15 +804,6 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args) #endif // settings } -static QObject *module_api_factory(QQmlEngine *engine, QJSEngine *scriptEngine) -{ - Q_UNUSED(engine) - Q_UNUSED(scriptEngine) - QQuickLocalStorage *api = new QQuickLocalStorage(); - - return api; -} - class QQmlLocalStoragePlugin : public QQmlExtensionPlugin { Q_OBJECT @@ -823,7 +816,7 @@ public: void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.LocalStorage")); - qmlRegisterSingletonType<QQuickLocalStorage>(uri, 2, 0, "LocalStorage", module_api_factory); + qmlRegisterTypesAndRevisions<QQuickLocalStorage>(uri, 2); qmlRegisterModule(uri, 2, 15); } |