From 6cfd503ef805651bfe9a112bfdb937f0092577ce Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Fri, 1 Mar 2019 12:05:56 +0100 Subject: Add QDeclarativeGeoServiceProviderRequirements navigation property This was previously missing, making it impossible to require specific navigation features. [ChangeLog] Added QDeclarativeGeoServiceProviderRequirements navigation property. Change-Id: I75f8f3208aa387aea9d1652bb674fdb747877747 Fixes: QTBUG-72505 Reviewed-by: Alex Blasche --- tests/auto/declarative_core/tst_plugin.qml | 2 ++ tests/auto/geotestplugin/geotestplugin.json | 3 ++- tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/declarative_core/tst_plugin.qml b/tests/auto/declarative_core/tst_plugin.qml index 7b880f1d..23c1ff9f 100644 --- a/tests/auto/declarative_core/tst_plugin.qml +++ b/tests/auto/declarative_core/tst_plugin.qml @@ -54,6 +54,7 @@ Item { mapping: Plugin.OfflineMappingFeature; geocoding: Plugin.OfflineGeocodingFeature; places: Plugin.AnyPlacesFeatures; + navigation: Plugin.AnyNavigationFeatures; } } @@ -120,6 +121,7 @@ Item { verify(requiredPlugin.supportsMapping(requiredPlugin.required.mapping)) verify(requiredPlugin.supportsGeocoding(requiredPlugin.required.geocoding)) verify(requiredPlugin.supportsPlaces(requiredPlugin.required.places)) + verify(requiredPlugin.supportsNavigation(requiredPlugin.required.navigation)) } function test_placesFeatures() { diff --git a/tests/auto/geotestplugin/geotestplugin.json b/tests/auto/geotestplugin/geotestplugin.json index 52721715..f6218b67 100644 --- a/tests/auto/geotestplugin/geotestplugin.json +++ b/tests/auto/geotestplugin/geotestplugin.json @@ -14,6 +14,7 @@ "OfflinePlacesFeature", "SavePlaceFeature", "SaveCategoryFeature", - "SearchSuggestionsFeature" + "SearchSuggestionsFeature", + "OfflineNavigationFeature" ] } diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h index c606fdb0..ac195d69 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h @@ -34,10 +34,10 @@ QT_USE_NAMESPACE -class QGeoServiceProviderFactoryTest: public QObject, public QGeoServiceProviderFactory +class QGeoServiceProviderFactoryTest: public QObject, public QGeoServiceProviderFactoryV2 { Q_OBJECT - Q_INTERFACES(QGeoServiceProviderFactory) + Q_INTERFACES(QGeoServiceProviderFactoryV2) Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" FILE "geotestplugin.json") -- cgit v1.2.3