diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-09-10 00:18:43 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-09-12 22:19:41 +0200 |
commit | 6786f0fc1505d5a1b9ef3341e06bc209e463304a (patch) | |
tree | 48ce4cb7163ece87f533700ae917f1f9ba41b5e2 /src/location/maps/qgeoserviceproviderfactory.h | |
parent | 48eb0a642688f792eb285ec56082b8f3c09d6605 (diff) |
Merge the factory versions into one
Change-Id: I24ebd31750c95163d099c6f2daad2c96f468a515
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/location/maps/qgeoserviceproviderfactory.h')
-rw-r--r-- | src/location/maps/qgeoserviceproviderfactory.h | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index 187476dc..f804cbe6 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -66,38 +66,15 @@ public: virtual QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; -}; - -Q_DECLARE_INTERFACE(QGeoServiceProviderFactory, - "org.qt-project.qt.geoservice.serviceproviderfactory/6.0") - -class Q_LOCATION_EXPORT QGeoServiceProviderFactoryV2 : public QGeoServiceProviderFactory -{ -public: - virtual ~QGeoServiceProviderFactoryV2() {} virtual QNavigationManagerEngine *createNavigationManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; -}; - -// Although not actually used for constructing a specialized loader, this is required for -// casting a QObject * into QGeoServiceProviderFactoryV2 * -Q_DECLARE_INTERFACE(QGeoServiceProviderFactoryV2, - "org.qt-project.qt.geoservice.serviceproviderfactoryV2/5.0") - -class Q_LOCATION_EXPORT QGeoServiceProviderFactoryV3 : public QGeoServiceProviderFactoryV2 -{ -public: - virtual ~QGeoServiceProviderFactoryV3() {} - virtual void setQmlEngine(QQmlEngine * engine); }; -// Although not actually used for constructing a specialized loader, this is required for -// casting a QObject * into QGeoServiceProviderFactoryV3 * -Q_DECLARE_INTERFACE(QGeoServiceProviderFactoryV3, - "org.qt-project.qt.geoservice.serviceproviderfactoryV3/5.0") +Q_DECLARE_INTERFACE(QGeoServiceProviderFactory, + "org.qt-project.qt.geoservice.serviceproviderfactory/6.0") QT_END_NAMESPACE |