diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:00:31 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:00:31 +0200 |
| commit | d8adb9630d3c3d6796f6f679f0634fd880b91ecf (patch) | |
| tree | 7c0d8d1854e0515b61eada26a8ad90c427c798b2 | |
| parent | b44858e1e78820ce1139ee656a1892fb12c4799c (diff) | |
| parent | 303a9ec664b138050190306be76fa201dcc27cc8 (diff) | |
| download | qtlocation-d8adb9630d3c3d6796f6f679f0634fd880b91ecf.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ia5c2bfb2e13e9aaf9c977dae97a8037070ec7279
| -rw-r--r-- | src/positioning/qgeopositioninfosource.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp index 4690f8a3..0610bd79 100644 --- a/src/positioning/qgeopositioninfosource.cpp +++ b/src/positioning/qgeopositioninfosource.cpp @@ -374,8 +374,11 @@ QGeoPositionInfoSource *QGeoPositionInfoSource::createDefaultSource(const QVaria QList<QJsonObject> plugins = QGeoPositionInfoSourcePrivate::pluginsSorted(); foreach (const QJsonObject &obj, plugins) { if (obj.value(QStringLiteral("Position")).isBool() - && obj.value(QStringLiteral("Position")).toBool()) - return createSource_real(obj, parameters, parent); + && obj.value(QStringLiteral("Position")).toBool()) { + QGeoPositionInfoSource *source = createSource_real(obj, parameters, parent); + if (source) + return source; + } } return nullptr; } |