use centralized qml plugin project handling

Change-Id: Icfbc814eea58fd03e07ec6ef03eced164955e072
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

6 files changed, 6 insertions, 126 deletions

diff --git a/src/imports/publishsubscribe/publishsubscribe.pro b/src/imports/publishsubscribe/publishsubscribe.pro
index 1dba580e..eb33416b 100644
--- a/src/imports/publishsubscribe/publishsubscribe.pro
+++ b/src/imports/publishsubscribe/publishsubscribe.pro
@@ -1,15 +1,3 @@
-TARGET  = declarative_publishsubscribe
-TARGETPATH = QtPublishSubscribe
-
-include(qpublishsubscribeimport.pri)
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-DESTDIR = $$QT.publishsubscribe.imports/$$TARGETPATH
-INSTALLS += target
-
-qmldir.files += $$PWD/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-INSTALLS += qmldir
-
 QT += qml publishsubscribe core-private
 
 SOURCES += publishsubscribe.cpp \
@@ -20,3 +8,5 @@ SOURCES += publishsubscribe.cpp \
 HEADERS += qdeclarativevaluespacepublisher_p.h \
            qdeclarativevaluespacepublishermetaobject_p.h \
            qdeclarativevaluespacesubscriber_p.h
+
+load(qml_plugin)
diff --git a/src/imports/publishsubscribe/qpublishsubscribeimport.pri b/src/imports/publishsubscribe/qpublishsubscribeimport.pri
deleted file mode 100644
index 4a9e83bc..00000000
--- a/src/imports/publishsubscribe/qpublishsubscribeimport.pri
+++ /dev/null
@@ -1,30 +0,0 @@
-load(qt_module)
-
-TEMPLATE = lib
-CONFIG += qt plugin
-
-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
-
-isEmpty(TARGETPATH) {
-    error("qimportbase.pri: You must provide a TARGETPATH!")
-}
-
-isEmpty(TARGET) {
-    error("qimportbase.pri: You must provide a TARGET!")
-}
-
-QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
-copy2build.input = QMLDIRFILE
-copy2build.output = $$QT.publishsubscribe.imports/$$TARGETPATH/qmldir
-!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
-copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copy2build.name = COPY ${QMAKE_FILE_IN}
-copy2build.CONFIG += no_link
-# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
-copy2build.CONFIG += no_clean
-QMAKE_EXTRA_COMPILERS += copy2build
-
-TARGET = $$qtLibraryTarget($$TARGET)
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-
-load(qt_targets)
diff --git a/src/imports/serviceframework/qserviceframeworkimport.pri b/src/imports/serviceframework/qserviceframeworkimport.pri
deleted file mode 100644
index a69df82c..00000000
--- a/src/imports/serviceframework/qserviceframeworkimport.pri
+++ /dev/null
@@ -1,30 +0,0 @@
-load(qt_module)
-
-TEMPLATE = lib
-CONFIG += qt plugin
-
-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
-
-isEmpty(TARGETPATH) {
-    error("qimportbase.pri: You must provide a TARGETPATH!")
-}
-
-isEmpty(TARGET) {
-    error("qimportbase.pri: You must provide a TARGET!")
-}
-
-QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
-copy2build.input = QMLDIRFILE
-copy2build.output = $$QT.serviceframework.imports/$$TARGETPATH/qmldir
-!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
-copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copy2build.name = COPY ${QMAKE_FILE_IN}
-copy2build.CONFIG += no_link
-# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
-copy2build.CONFIG += no_clean
-QMAKE_EXTRA_COMPILERS += copy2build
-
-TARGET = $$qtLibraryTarget($$TARGET)
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-
-load(qt_targets)
diff --git a/src/imports/serviceframework/serviceframework.pro b/src/imports/serviceframework/serviceframework.pro
index 471f38f5..608e0f20 100644
--- a/src/imports/serviceframework/serviceframework.pro
+++ b/src/imports/serviceframework/serviceframework.pro
@@ -1,16 +1,3 @@
-TARGET  = declarative_serviceframework
-TARGETPATH = QtServiceFramework
-
-include(qserviceframeworkimport.pri)
-
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-DESTDIR = $$QT.serviceframework.imports/$$TARGETPATH
-
-qmldir.files += $$PWD/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-INSTALLS += qmldir target
-
 QT += qml serviceframework
 
 HEADERS += qdeclarativeservice_p.h \
@@ -19,3 +6,5 @@ HEADERS += qdeclarativeservice_p.h \
 SOURCES += qdeclarativeservice.cpp \
            qdeclarativeserviceold.cpp \
            serviceframework.cpp 
+
+load(qml_plugin)
diff --git a/src/imports/systeminfo/qsysteminfoimport.pri b/src/imports/systeminfo/qsysteminfoimport.pri
deleted file mode 100644
index ed64af60..00000000
--- a/src/imports/systeminfo/qsysteminfoimport.pri
+++ /dev/null
@@ -1,30 +0,0 @@
-load(qt_module)
-
-TEMPLATE = lib
-CONFIG += qt plugin
-
-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
-
-isEmpty(TARGETPATH) {
-    error("qimportbase.pri: You must provide a TARGETPATH!")
-}
-
-isEmpty(TARGET) {
-    error("qimportbase.pri: You must provide a TARGET!")
-}
-
-QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
-copy2build.input = QMLDIRFILE
-copy2build.output = $$QT.systeminfo.imports/$$TARGETPATH/qmldir
-!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
-copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copy2build.name = COPY ${QMAKE_FILE_IN}
-copy2build.CONFIG += no_link
-# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
-copy2build.CONFIG += no_clean
-QMAKE_EXTRA_COMPILERS += copy2build
-
-TARGET = $$qtLibraryTarget($$TARGET)
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-
-load(qt_targets)
diff --git a/src/imports/systeminfo/systeminfo.pro b/src/imports/systeminfo/systeminfo.pro
index e1ddca13..61abf834 100644
--- a/src/imports/systeminfo/systeminfo.pro
+++ b/src/imports/systeminfo/systeminfo.pro
@@ -1,14 +1,3 @@
-TARGET  = declarative_systeminfo
-TARGETPATH = QtSystemInfo
-include(qsysteminfoimport.pri)
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-DESTDIR = $$QT.systeminfo.imports/$$TARGETPATH
-INSTALLS += target
-
-qmldir.files += $$PWD/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-INSTALLS += qmldir
-
 QT += qml systeminfo
 
 HEADERS += \
@@ -27,3 +16,5 @@ SOURCES += \
     qdeclarativestorageinfo.cpp \
     qdeclarativedeviceprofile.cpp \
     qsysteminfo.cpp
+
+load(qml_plugin)