4 files changed, 8 insertions, 13 deletions
diff --git a/src/imports/jsondb-listmodel/jsondb-listmodel.pro b/src/imports/jsondb-listmodel/jsondb-listmodel.pro
index 9e86677..cfa60ad 100644
--- a/src/imports/jsondb-listmodel/jsondb-listmodel.pro
+++ b/src/imports/jsondb-listmodel/jsondb-listmodel.pro
@@ -18,6 +18,7 @@ INSTALLS += target qmldir
     qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
     QMLTYPESFILE = $$QT.jsondb.imports/$$TARGETPATH/plugin.qmltypes
     mac: !exists($$QMLPLUGINDUMP): QMLPLUGINDUMP = "$${QMLPLUGINDUMP}.app/Contents/MacOS/qmlplugindump"
+    unix:!mac: QMLPLUGINDUMP = "$${QMLPLUGINDUMP} -platform minimal"
     QMAKE_POST_LINK += LD_LIBRARY_PATH=$$QT.jsondb.libs $$QMLPLUGINDUMP QtAddOn.JsonDb 1.0 $$QT.jsondb.imports > $$QMLTYPESFILE
 
     qmltypes.files = $$QMLTYPESFILE
@@ -27,19 +28,15 @@ INSTALLS += target qmldir
 
 VERSION = 1.0
 
-include(../../common/common.pri)
-
 HEADERS += \
     jsondb-listmodel.h \
     jsondb-listmodel_p.h \
     jsondb-component.h \
     plugin.h
 
-HEADERS += $$QSONCONVERSION_HEADERS
-
 SOURCES += \
     jsondb-listmodel.cpp \
     jsondb-component.cpp \
     plugin.cpp
 
-SOURCES += $$QSONCONVERSION_SOURCES
+OTHER_FILES += jsondb.json
diff --git a/src/imports/jsondb-listmodel/jsondb.json b/src/imports/jsondb-listmodel/jsondb.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/src/imports/jsondb-listmodel/jsondb.json
@@ -0,0 +1 @@
+{}
diff --git a/src/imports/jsondb-listmodel/plugin.cpp b/src/imports/jsondb-listmodel/plugin.cpp
index 3bd5763..28554c0 100644
--- a/src/imports/jsondb-listmodel/plugin.cpp
+++ b/src/imports/jsondb-listmodel/plugin.cpp
@@ -45,9 +45,6 @@
 #include "jsondb-component.h"
 #include "jsondb-listmodel.h"
 
-Q_EXPORT_STATIC_PLUGIN(JsonDbListModelPlugin)
-Q_EXPORT_PLUGIN2(jsondblistmodelplugin, JsonDbListModelPlugin)
-
 void JsonDbListModelPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_UNUSED(engine);
diff --git a/src/imports/jsondb-listmodel/plugin.h b/src/imports/jsondb-listmodel/plugin.h
index 68b28ab..e6e88b3 100644
--- a/src/imports/jsondb-listmodel/plugin.h
+++ b/src/imports/jsondb-listmodel/plugin.h
@@ -47,12 +47,12 @@
 
 class JsonDbListModelPlugin : public QQmlExtensionPlugin
 {
-  Q_OBJECT
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "jsondb.json")
 
-  public:
-
-  void initializeEngine(QQmlEngine *engine, const char *uri);
-  void registerTypes(const char *uri);
+public:
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri);
 };
 
 #endif