1 files changed, 16 insertions, 21 deletions
diff --git a/src/imports/jsondb/jsondb.pro b/src/imports/jsondb/jsondb.pro
index 781e3d1d..1f6e7f4a 100644
--- a/src/imports/jsondb/jsondb.pro
+++ b/src/imports/jsondb/jsondb.pro
@@ -3,9 +3,9 @@ TARGETPATH = QtJsonDb
 
 include(../qimportbase.pri)
 
-QT += network qml jsondbcompat-private
+QT += network qml jsondb jsondb-private
 
-DESTDIR = $$QT.jsondbcompat.imports/$$TARGETPATH
+DESTDIR = $$QT.jsondb.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
@@ -17,8 +17,9 @@ INSTALLS += target qmldir
 !cross_compile {
     qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
     mac: !exists($$QMLPLUGINDUMP): QMLPLUGINDUMP = "$${QMLPLUGINDUMP}.app/Contents/MacOS/qmlplugindump"
-    QMLTYPESFILE = $$QT.jsondbcompat.imports/$$TARGETPATH/plugin.qmltypes
-    QMAKE_POST_LINK += LD_LIBRARY_PATH=$$QT.jsondbcompat.libs $$QMLPLUGINDUMP QtJsonDb 1.0 $$QT.jsondbcompat.imports > $$QMLTYPESFILE
+    unix:!mac: QMLPLUGINDUMP = "$${QMLPLUGINDUMP} -platform minimal"
+    QMLTYPESFILE = $$QT.jsondb.imports/$$TARGETPATH/plugin.qmltypes
+    QMAKE_POST_LINK += LD_LIBRARY_PATH=$$QT.jsondb.libs $$QMLPLUGINDUMP QtJsonDb 1.0 $$QT.jsondb.imports > $$QMLTYPESFILE
 
     qmltypes.files = $$QMLTYPESFILE
     qmltypes.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
@@ -27,37 +28,31 @@ INSTALLS += target qmldir
 
 VERSION = 1.0
 
-include(../../common/common.pri)
-
 HEADERS += \
     jsondbpartition.h \
     jsondbnotification.h \
-    jsondbsortinglistmodel.h \
-    jsondbsortinglistmodel_p.h \
-    jsondblistmodel.h \
-    jsondblistmodel_p.h \
     plugin.h \
     jsondatabase.h \
     jsondbqueryobject.h \
-    jsondbchangessinceobject.h \
+    jsondbmodelutils.h \
     jsondbmodelcache.h \
+    jsondblistmodel.h \
+    jsondblistmodel_p.h \
+    jsondbsortinglistmodel_p.h \
+    jsondbsortinglistmodel.h \
     jsondbcachinglistmodel_p.h \
-    jsondbcachinglistmodel.h \
-    jsondbmodelutils.h
-
-HEADERS += $$QSONCONVERSION_HEADERS
+    jsondbcachinglistmodel.h
 
 SOURCES += \
     jsondbpartition.cpp \
     jsondbnotification.cpp \
-    jsondbsortinglistmodel.cpp \
-    jsondblistmodel.cpp \
     plugin.cpp \
     jsondatabase.cpp \
     jsondbqueryobject.cpp \
-    jsondbchangessinceobject.cpp \
-    jsondbcachinglistmodel.cpp \
+    jsondbmodelutils.cpp \
     jsondbmodelcache.cpp \
-    jsondbmodelutils.cpp
+    jsondblistmodel.cpp \
+    jsondbsortinglistmodel.cpp \
+    jsondbcachinglistmodel.cpp
 
-SOURCES += $$QSONCONVERSION_SOURCES
+OTHER_FILES += jsondb.json