summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2019-01-04 09:12:09 +0100
committerOliver Wolff <oliver.wolff@qt.io>2019-01-14 12:43:19 +0000
commit379f398ca56458e413cbebbebcbdfa1337cfb6e5 (patch)
tree66c8c05f283c6bb5078dc2127b5fd7ec1f77fa87
parente9489c97823e89feadb96df5e299b4e981ba667c (diff)
downloadqtlocation-379f398ca56458e413cbebbebcbdfa1337cfb6e5.tar.gz
winrt: Depend on access to service for supportedPositioningMethods
The locator's status is only updated while a positioning session is active so it does not always reflect the correct state. By checking the access we have a more reliable way to reflect the current state. Task-number: QTBUG-66427 Change-Id: I75d2274c9efd29bf070913246738bf18a9ec5edc Reviewed-by: Miguel Costa <miguel.costa@qt.io>
-rw-r--r--src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
index a720f104..2fedf5b5 100644
--- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
+++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
@@ -197,18 +197,8 @@ QGeoPositionInfo QGeoPositionInfoSourceWinRT::lastKnownPosition(bool fromSatelli
QGeoPositionInfoSource::PositioningMethods QGeoPositionInfoSourceWinRT::supportedPositioningMethods() const
{
- Q_D(const QGeoPositionInfoSourceWinRT);
-
- qCDebug(lcPositioningWinRT) << __FUNCTION__;
-
- switch (d->positionStatus) {
- case PositionStatus::PositionStatus_NoData:
- case PositionStatus::PositionStatus_Disabled:
- case PositionStatus::PositionStatus_NotAvailable:
- return QGeoPositionInfoSource::NoPositioningMethods;
- }
-
- return QGeoPositionInfoSource::AllPositioningMethods;
+ return requestAccess() ? QGeoPositionInfoSource::AllPositioningMethods
+ : QGeoPositionInfoSource::NoPositioningMethods;
}
void QGeoPositionInfoSourceWinRT::setPreferredPositioningMethods(QGeoPositionInfoSource::PositioningMethods methods)