diff options
12 files changed, 17 insertions, 65 deletions
diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index 659fa422..9ce2a179 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -7,10 +7,9 @@ contains(QT_CONFIG, location-china-support) { QT += systeminfo } +PLUGIN_TYPE = geoservices load(qt_plugin) -DESTDIR = $$QT.location.plugins/geoservices - HEADERS += \ qgeocodereply_nokia.h \ qgeocodexmlparser.h \ @@ -55,9 +54,6 @@ RESOURCES += resource.qrc INCLUDEPATH += $$QT.location.includes INCLUDEPATH += ../../../location/maps -target.path += $$[QT_INSTALL_PLUGINS]/geoservices -INSTALLS += target - OTHER_FILES += \ nokia_plugin.json diff --git a/src/plugins/geoservices/places_jsondb/places_jsondb.pro b/src/plugins/geoservices/places_jsondb/places_jsondb.pro index dc5ab371..d710ff5f 100644 --- a/src/plugins/geoservices/places_jsondb/places_jsondb.pro +++ b/src/plugins/geoservices/places_jsondb/places_jsondb.pro @@ -1,10 +1,9 @@ TARGET = qtgeoservices_places_jsondb QT += location gui network +PLUGIN_TYPE = geoservices load(qt_plugin) -DESTDIR = $$QT.location.plugins/geoservices - HEADERS += \ qgeoserviceproviderplugin_jsondb.h \ qplacemanagerengine_jsondb.h \ @@ -37,8 +36,5 @@ INCLUDEPATH += $$QT.location.includes QT += jsondb -target.path += $$[QT_INSTALL_PLUGINS]/geoservices -INSTALLS += target - OTHER_FILES += \ places_jsondb_plugin.json diff --git a/src/plugins/position/geoclue/geoclue.pro b/src/plugins/position/geoclue/geoclue.pro index 79a6f66c..0ed31781 100644 --- a/src/plugins/position/geoclue/geoclue.pro +++ b/src/plugins/position/geoclue/geoclue.pro @@ -1,10 +1,9 @@ TARGET = qtposition_geoclue QT += location gui +PLUGIN_TYPE = position load(qt_plugin) -DESTDIR = $$QT.location.plugins/position - HEADERS += \ qgeopositioninfosource_geocluemaster_p.h \ qgeopositioninfosourcefactory_geoclue.h @@ -18,8 +17,5 @@ INCLUDEPATH += $$QT.location.includes CONFIG += link_pkgconfig PKGCONFIG += geoclue gconf-2.0 -target.path += $$[QT_INSTALL_PLUGINS]/position -INSTALLS += target - OTHER_FILES += \ plugin.json diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro index f07359f2..2255746e 100644 --- a/src/plugins/position/gypsy/gypsy.pro +++ b/src/plugins/position/gypsy/gypsy.pro @@ -1,10 +1,9 @@ TARGET = qtposition_gypsy QT += location gui +PLUGIN_TYPE = position load(qt_plugin) -DESTDIR = $$QT.location.plugins/position - HEADERS += \ qgeosatelliteinfosource_gypsy_p.h \ qgeopositioninfosourcefactory_gypsy.h @@ -18,8 +17,5 @@ INCLUDEPATH += $$QT.location.includes CONFIG += link_pkgconfig PKGCONFIG += gypsy gconf-2.0 -target.path += $$[QT_INSTALL_PLUGINS]/position -INSTALLS += target - OTHER_FILES += \ plugin.json diff --git a/src/plugins/position/maemo/maemo.pro b/src/plugins/position/maemo/maemo.pro index 6a4d6dcb..c8feffc8 100644 --- a/src/plugins/position/maemo/maemo.pro +++ b/src/plugins/position/maemo/maemo.pro @@ -1,10 +1,9 @@ TARGET = qtposition_maemo QT += location gui dbus +PLUGIN_TYPE = position load(qt_plugin) -DESTDIR = $$QT.location.plugins/position - INCLUDEPATH += $$QT.location.includes SOURCES += qgeopositioninfosource_maemo.cpp \ @@ -18,8 +17,5 @@ HEADERS += qgeopositioninfosource_maemo_p.h \ dbusserver_maemo_p.h \ qgeopositioninfosourcefactory_maemo.h -target.path += $$[QT_INSTALL_PLUGINS]/position -INSTALLS += target - OTHER_FILES += \ plugin.json diff --git a/src/plugins/position/npe_backend/npe_backend.pro b/src/plugins/position/npe_backend/npe_backend.pro index f560de16..72827e1b 100644 --- a/src/plugins/position/npe_backend/npe_backend.pro +++ b/src/plugins/position/npe_backend/npe_backend.pro @@ -1,10 +1,9 @@ TARGET = qtposition_npe_backend QT += location gui +PLUGIN_TYPE = position load(qt_plugin) -DESTDIR = $$QT.location.plugins/position - INCLUDEPATH += $$QT.location.includes DEFINES += NPE_BACKEND @@ -21,8 +20,5 @@ HEADERS += qgeopositioninfosource_npe_backend_p.h \ qgeosatelliteinfosource_npe_backend_p.h \ qgeopositioninfosourcefactory_npe_backend.h -target.path += $$[QT_INSTALL_PLUGINS]/position -INSTALLS += target - OTHER_FILES += \ plugin.json diff --git a/src/plugins/position/simulator/simulator.pro b/src/plugins/position/simulator/simulator.pro index 0bbda9c8..944907f7 100644 --- a/src/plugins/position/simulator/simulator.pro +++ b/src/plugins/position/simulator/simulator.pro @@ -1,10 +1,9 @@ TARGET = qtposition_simulator QT += location gui +PLUGIN_TYPE = position load(qt_plugin) -DESTDIR = $$QT.location.plugins/position - INCLUDEPATH += $$QT.location.includes QT += simulator @@ -20,8 +19,5 @@ HEADERS += qgeopositioninfosource_simulator_p.h \ qlocationconnection_simulator_p.h \ qgeopositioninfosourcefactory_simulator.h -target.path += $$[QT_INSTALL_PLUGINS]/position -INSTALLS += target - OTHER_FILES += \ plugin.json diff --git a/tests/auto/geotestplugin/geotestplugin.pro b/tests/auto/geotestplugin/geotestplugin.pro index 4970bc77..3737414e 100644 --- a/tests/auto/geotestplugin/geotestplugin.pro +++ b/tests/auto/geotestplugin/geotestplugin.pro @@ -1,9 +1,8 @@ -load(qt_plugin) - TARGET = qtgeoservices_qmltestplugin QT += location-private testlib -DESTDIR = $$QT.location.plugins/geoservices +PLUGIN_TYPE = geoservices +load(qt_plugin) HEADERS += qgeocodingmanagerengine_test.h \ qgeoserviceproviderplugin_test.h \ @@ -15,9 +14,6 @@ HEADERS += qgeocodingmanagerengine_test.h \ SOURCES += qgeoserviceproviderplugin_test.cpp -target.path += $$[QT_INSTALL_PLUGINS]/geoservices -INSTALLS += target - OTHER_FILES += \ geotestplugin.json \ place_data.json diff --git a/tests/auto/placesplugin_unsupported/placesplugin_unsupported.pro b/tests/auto/placesplugin_unsupported/placesplugin_unsupported.pro index 1d731727..6e10c8c9 100644 --- a/tests/auto/placesplugin_unsupported/placesplugin_unsupported.pro +++ b/tests/auto/placesplugin_unsupported/placesplugin_unsupported.pro @@ -1,17 +1,13 @@ -load(qt_plugin) - TARGET = qtgeoservices_placesplugin_unsupported QT += location -DESTDIR = $$QT.location.plugins/geoservices +PLUGIN_TYPE = geoservices +load(qt_plugin) HEADERS += qgeoserviceproviderplugin_test.h SOURCES += qgeoserviceproviderplugin_test.cpp -target.path += $$[QT_INSTALL_PLUGINS]/geoservices -INSTALLS += target - OTHER_FILES += \ placesplugin.json DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/positionplugin/positionplugin.pro b/tests/auto/positionplugin/positionplugin.pro index 448bdd58..72918415 100644 --- a/tests/auto/positionplugin/positionplugin.pro +++ b/tests/auto/positionplugin/positionplugin.pro @@ -1,15 +1,11 @@ -load(qt_plugin) - TARGET = qtposition_testplugin QT += location -DESTDIR = $$QT.location.plugins/position +PLUGIN_TYPE = position +load(qt_plugin) SOURCES += plugin.cpp -target.path += $$[QT_INSTALL_PLUGINS]/position -INSTALLS += target - OTHER_FILES += \ plugin.json DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro index 79a8475f..d0e0854a 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro +++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro @@ -1,18 +1,14 @@ -load(qt_plugin) - TARGET = qtgeoservices_geocodingplugin QT += location -DESTDIR = $$QT.location.plugins/geoservices +PLUGIN_TYPE = geoservices +load(qt_plugin) HEADERS += qgeocodingmanagerengine_test.h \ qgeoserviceproviderplugin_test.h SOURCES += qgeoserviceproviderplugin_test.cpp -target.path += $$[QT_INSTALL_PLUGINS]/geoservices -INSTALLS += target - OTHER_FILES += \ geocoding_plugin.json DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerplugins.pro b/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerplugins.pro index 8e2c4302..cb17bcc6 100644 --- a/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerplugins.pro +++ b/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerplugins.pro @@ -1,18 +1,14 @@ -load(qt_plugin) - TARGET = qtgeoservices_routingplugin QT += location -DESTDIR = $$QT.location.plugins/geoservices +PLUGIN_TYPE = geoservices +load(qt_plugin) HEADERS += qgeoroutingmanagerengine_test.h \ qgeoserviceproviderplugin_test.h SOURCES += qgeoserviceproviderplugin_test.cpp -target.path += $$[QT_INSTALL_PLUGINS]/geoservices -INSTALLS += target - OTHER_FILES += \ routing_plugin.json DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |