diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-09 18:57:16 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 23:33:48 +0200 |
commit | efece5c88fab7ad6ece2468ed3560c961e798f2c (patch) | |
tree | dfb92a40e24ef61dabbff2990b24e6df9d391737 | |
parent | 107f587eb2ffae86432279e50baff76bb0a5ba89 (diff) |
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>
-rw-r--r-- | src/imports/jsondb-listmodel/jsondb-listmodel.pro | 28 | ||||
-rw-r--r-- | src/imports/jsondb-listmodel/qmldir_debug | 1 | ||||
-rw-r--r-- | src/imports/jsondb/jsondb.pro | 29 | ||||
-rw-r--r-- | src/imports/jsondb/qmldir_debug | 1 |
4 files changed, 6 insertions, 53 deletions
diff --git a/src/imports/jsondb-listmodel/jsondb-listmodel.pro b/src/imports/jsondb-listmodel/jsondb-listmodel.pro index 181ab64..870cd03 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 f8487ae..0000000 --- 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 e553049..7ba665c 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 b0d452c..0000000 --- a/src/imports/jsondb/qmldir_debug +++ /dev/null @@ -1 +0,0 @@ -plugin jsondbplugin_debug |