diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-01-20 18:15:45 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-01-22 09:30:52 +0100 |
| commit | b45ee37f5587f9193c8c03bba580334fbf0d9d42 (patch) | |
| tree | 981a03f1bcc818ade90a08ac288f83bcf0ca037f /src/positioning/qgeopositioninfosource.cpp | |
| parent | 3aeb0bf45f605d03fa9c506ae2d06e9ec09eec9f (diff) | |
| download | qtlocation-b45ee37f5587f9193c8c03bba580334fbf0d9d42.tar.gz | |
QtPositioning: refactor QGeoPositionInfoSourceFactory
[ChangeLog][QtPositioning][Important Behavior Changes] Remove
QGeoPositionInfoSourceFactoryV2 and update QGeoPositionInfoSourceFactory
to support source configuration parameters. Update plugin ID string.
Task-number: QTBUG-90491
Change-Id: I1d3dc556d73e273e2e364f77e2decaad11810547
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/positioning/qgeopositioninfosource.cpp')
| -rw-r--r-- | src/positioning/qgeopositioninfosource.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp index 968b2914..79357729 100644 --- a/src/positioning/qgeopositioninfosource.cpp +++ b/src/positioning/qgeopositioninfosource.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, - ("org.qt-project.qt.position.sourcefactory/5.0", + ("org.qt-project.qt.position.sourcefactory/6.0", QLatin1String("/position"))) /*! @@ -126,11 +126,7 @@ void QGeoPositionInfoSourcePrivate::loadPlugin() QObject *instance = loader()->instance(idx); if (!instance) return; - factoryV2 = qobject_cast<QGeoPositionInfoSourceFactoryV2 *>(instance); - if (!factoryV2) - factory = qobject_cast<QGeoPositionInfoSourceFactory *>(instance); - else - factory = factoryV2; + factory = qobject_cast<QGeoPositionInfoSourceFactory *>(instance); } bool QGeoPositionInfoSourcePrivate::setBackendProperty(const QString &/*name*/, const QVariant & /*value*/) @@ -334,10 +330,8 @@ static QGeoPositionInfoSource* createSource_real(const QJsonObject &meta, const d.metaData = meta; d.loadPlugin(); QGeoPositionInfoSource *s = nullptr; - if (!parameters.isEmpty() && d.factoryV2) - s = d.factoryV2->positionInfoSourceWithParameters(parent, parameters); - else if (d.factory) - s = d.factory->positionInfoSource(parent); + if (d.factory) + s = d.factory->positionInfoSource(parent, parameters); if (s) QGeoPositionInfoSourcePrivate::get(*s)->metaData = d.metaData; |