diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:24 +1000 |
|---|---|---|
| committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:54 +1000 |
| commit | 0284817d6cd7e17afa8da26ee6e9199100754446 (patch) | |
| tree | c351d55d5a606c81c72e481f846b9b9e2603c883 /src/imports/localstorage | |
| parent | 377eb94eb19dafeca20d12bc6b624f1779fae514 (diff) | |
| parent | 36bd7f616f37f5f60e59bce1f0d8970248d627de (diff) | |
Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
Diffstat (limited to 'src/imports/localstorage')
| -rw-r--r-- | src/imports/localstorage/localstorage.json | 1 | ||||
| -rw-r--r-- | src/imports/localstorage/localstorage.pro | 4 | ||||
| -rw-r--r-- | src/imports/localstorage/plugin.cpp | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/imports/localstorage/localstorage.json b/src/imports/localstorage/localstorage.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/src/imports/localstorage/localstorage.json @@ -0,0 +1 @@ +{} diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro index c54bc564d9..fa1718dd68 100644 --- a/src/imports/localstorage/localstorage.pro +++ b/src/imports/localstorage/localstorage.pro @@ -6,10 +6,12 @@ QT += sql qml qml-private v8-private core-private SOURCES += plugin.cpp +OTHER_FILES += localstorage.json + DESTDIR = $$QT.qml.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -INSTALLS += target qmldir
\ No newline at end of file +INSTALLS += target qmldir diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 77e68877d4..7c55225ed1 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -651,6 +651,8 @@ static QObject *module_api_factory(QQmlEngine *engine, QJSEngine *scriptEngine) class QQmlLocalStoragePlugin : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "localstorage.json") + public: QQmlLocalStoragePlugin() { @@ -664,5 +666,3 @@ public: }; #include "plugin.moc" - -Q_EXPORT_PLUGIN2(plugin, QQmlLocalStoragePlugin); |