diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-25 18:08:11 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-27 09:10:19 +0200 |
commit | 2e9045f8ce92bddce4c549e87a4adb37476933a1 (patch) | |
tree | b8ae8d5e06330123485d9781ca4838f8f21a2a03 | |
parent | faea5c148820b94dc9becc1d69bb3a7f2072e926 (diff) | |
download | qtlocation-2e9045f8ce92bddce4c549e87a4adb37476933a1.tar.gz |
Bump plugin interface version to 6.0
Task-number: QTBUG-96795
Pick-to: 6.2
Change-Id: Ib56df68b2cbc3781f49d0749fcd598bbcd96c6fb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
12 files changed, 12 insertions, 12 deletions
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index 50d91230..4a82b3b6 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, - ("org.qt-project.qt.geoservice.serviceproviderfactory/5.0", + ("org.qt-project.qt.geoservice.serviceproviderfactory/6.0", QLatin1String("/geoservices"))) /*! diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index 6e77fb1b..187476dc 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -69,7 +69,7 @@ public: }; Q_DECLARE_INTERFACE(QGeoServiceProviderFactory, - "org.qt-project.qt.geoservice.serviceproviderfactory/5.0") + "org.qt-project.qt.geoservice.serviceproviderfactory/6.0") class Q_LOCATION_EXPORT QGeoServiceProviderFactoryV2 : public QGeoServiceProviderFactory { diff --git a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h index 6208348a..b25787e0 100644 --- a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h +++ b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h @@ -49,7 +49,7 @@ class GeoServiceProviderFactoryEsri: public QObject, public QGeoServiceProviderF { Q_OBJECT Q_INTERFACES(QGeoServiceProviderFactory) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" + Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "esri_plugin.json") public: diff --git a/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.h b/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.h index 01728677..0b97505c 100644 --- a/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.h +++ b/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.h @@ -49,7 +49,7 @@ class QGeoServiceProviderFactoryItemsOverlay: public QObject, public QGeoService { Q_OBJECT Q_INTERFACES(QGeoServiceProviderFactory) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" + Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "itemsoverlay_plugin.json") public: diff --git a/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.h b/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.h index 6ace0e08..2f920f12 100644 --- a/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.h +++ b/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.h @@ -49,7 +49,7 @@ class QGeoServiceProviderFactoryMapbox: public QObject, public QGeoServiceProvid { Q_OBJECT Q_INTERFACES(QGeoServiceProviderFactory) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" + Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "mapbox_plugin.json") public: diff --git a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.h b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.h index de28ac91..4d4ea704 100644 --- a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.h +++ b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.h @@ -50,7 +50,7 @@ class QGeoServiceProviderFactoryMapboxGL: public QObject, public QGeoServiceProv { Q_OBJECT Q_INTERFACES(QGeoServiceProviderFactory) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" + Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "mapboxgl_plugin.json") public: diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h index fafe771f..9e0cc3d3 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h @@ -51,7 +51,7 @@ class QGeoServiceProviderFactoryNokia : public QObject, public QGeoServiceProvid { Q_OBJECT Q_INTERFACES(QGeoServiceProviderFactory) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" + Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "nokia_plugin.json") public: diff --git a/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h b/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h index 36af54e2..26531bd7 100644 --- a/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h +++ b/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h @@ -49,7 +49,7 @@ class QGeoServiceProviderFactoryOsm: public QObject, public QGeoServiceProviderF { Q_OBJECT Q_INTERFACES(QGeoServiceProviderFactory) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" + Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "osm_plugin.json") public: diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h index d5d5599a..01a422c1 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h @@ -38,7 +38,7 @@ class QGeoServiceProviderFactoryTest: public QObject, public QGeoServiceProvider { Q_OBJECT Q_INTERFACES(QGeoServiceProviderFactoryV2) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" + Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "geotestplugin.json") public: diff --git a/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.h b/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.h index 49a3816c..b1df992e 100644 --- a/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.h +++ b/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.h @@ -37,7 +37,7 @@ class QGeoServiceProviderFactoryTest : public QObject, public QGeoServiceProvide { Q_OBJECT Q_INTERFACES(QGeoServiceProviderFactory) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" + Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "placesplugin.json") public: diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h index a864a93e..1d3e481a 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h +++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h @@ -38,7 +38,7 @@ class QGeoServiceProviderFactoryTest: public QObject, public QGeoServiceProvider { Q_OBJECT Q_INTERFACES(QGeoServiceProviderFactory) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" + Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "geocoding_plugin.json") public: diff --git a/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.h b/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.h index 0883c7be..c08b15e6 100644 --- a/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.h +++ b/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.h @@ -38,7 +38,7 @@ class QGeoServiceProviderFactoryTest: public QObject, public QGeoServiceProvider { Q_OBJECT Q_INTERFACES(QGeoServiceProviderFactory) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" + Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "routing_plugin.json") public: |