From efece5c88fab7ad6ece2468ed3560c961e798f2c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 9 Jul 2012 18:57:16 +0200
Subject: use centralized qml plugin project handling

note that this removes the qmldir_debug files. no other module has them,
either.

Change-Id: I359b9c5cb464f06fecb15b287cbf135a1cb31561
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 src/imports/jsondb-listmodel/jsondb-listmodel.pro | 28 +++-------------------
 src/imports/jsondb-listmodel/qmldir_debug         |  1 -
 src/imports/jsondb/jsondb.pro                     | 29 +++--------------------
 src/imports/jsondb/qmldir_debug                   |  1 -
 4 files changed, 6 insertions(+), 53 deletions(-)
 delete mode 100644 src/imports/jsondb-listmodel/qmldir_debug
 delete mode 100644 src/imports/jsondb/qmldir_debug

diff --git a/src/imports/jsondb-listmodel/jsondb-listmodel.pro b/src/imports/jsondb-listmodel/jsondb-listmodel.pro
index 181ab641..870cd03a 100644
--- a/src/imports/jsondb-listmodel/jsondb-listmodel.pro
+++ b/src/imports/jsondb-listmodel/jsondb-listmodel.pro
@@ -1,33 +1,9 @@
+CXX_MODULE = jsondb
 TARGET     = jsondblistmodelplugin
 TARGETPATH = QtAddOn/JsonDb
 
-include(../qimportbase.pri)
-
 QT += network qml jsondbcompat-private
 
-DESTDIR = $$QT.jsondb.imports/$$TARGETPATH
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-qmldir.files += $$PWD/qmldir
-qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-INSTALLS += target qmldir
-
-#rules for qmltypes
-!cross_compile:contains(QMAKE_HOST.arch, x86) | contains(QMAKE_HOST.arch, x86_64) {
-    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
-    qmltypes.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-    INSTALLS += qmltypes
-}
-
-VERSION = 1.0
-
 HEADERS += \
     jsondb-listmodel.h \
     jsondb-listmodel_p.h \
@@ -39,4 +15,6 @@ SOURCES += \
     jsondb-component.cpp \
     plugin.cpp
 
+load(qml_plugin)
+
 OTHER_FILES += jsondb.json
diff --git a/src/imports/jsondb-listmodel/qmldir_debug b/src/imports/jsondb-listmodel/qmldir_debug
deleted file mode 100644
index f8487aee..00000000
--- a/src/imports/jsondb-listmodel/qmldir_debug
+++ /dev/null
@@ -1 +0,0 @@
-plugin jsondblistmodelplugin_debug
diff --git a/src/imports/jsondb/jsondb.pro b/src/imports/jsondb/jsondb.pro
index e553049b..7ba665cb 100644
--- a/src/imports/jsondb/jsondb.pro
+++ b/src/imports/jsondb/jsondb.pro
@@ -1,33 +1,8 @@
+CXX_MODULE = jsondb
 TARGET     = jsondbplugin
-TARGETPATH = QtJsonDb
-
-include(../qimportbase.pri)
 
 QT += network qml jsondb jsondb-private
 
-DESTDIR = $$QT.jsondb.imports/$$TARGETPATH
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-qmldir.files += $$PWD/qmldir
-qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-INSTALLS += target qmldir
-
-#rules for qmltypes
-!cross_compile:contains(QMAKE_HOST.arch, x86) | contains(QMAKE_HOST.arch, x86_64) {
-    qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
-    mac: !exists($$QMLPLUGINDUMP): QMLPLUGINDUMP = "$${QMLPLUGINDUMP}.app/Contents/MacOS/qmlplugindump"
-    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
-    INSTALLS += qmltypes
-}
-
-VERSION = 1.0
-
 HEADERS += \
     jsondbpartition.h \
     jsondbnotification.h \
@@ -47,4 +22,6 @@ SOURCES += \
     jsondbsortinglistmodel.cpp \
     jsondblistmodel.cpp
 
+load(qml_plugin)
+
 OTHER_FILES += jsondb.json
diff --git a/src/imports/jsondb/qmldir_debug b/src/imports/jsondb/qmldir_debug
deleted file mode 100644
index b0d452c1..00000000
--- a/src/imports/jsondb/qmldir_debug
+++ /dev/null
@@ -1 +0,0 @@
-plugin jsondbplugin_debug
-- 
cgit v1.2.3