diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-24 15:31:47 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-23 11:27:29 +0100 |
commit | ae0ddd0073815813be62f604dbfd8834bce3f353 (patch) | |
tree | 9d8f7c5bc97119b545ada54362a6390854aa8db2 /tests/auto | |
parent | 8e6b5b089cc303521a4c72901f2f613ae1eff90b (diff) | |
download | qtlocation-ae0ddd0073815813be62f604dbfd8834bce3f353.tar.gz |
adjust to qt_plugin.prf changes
DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
Change-Id: Ifd9c031343b793f6da2a1ac595d54cb0b1176e5c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto')
5 files changed, 10 insertions, 30 deletions
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 |