summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2019-01-03 13:36:49 +0100
committerOliver Wolff <oliver.wolff@qt.io>2019-01-14 12:43:17 +0000
commitd733cca4369f283dd0a070caf714f90a82bbced8 (patch)
tree41a7ec749f1ae7f261111bc160209a741bed3613
parent7bd6955fa1d1839f542fe6f83199e78e15f623b7 (diff)
downloadqtlocation-d733cca4369f283dd0a070caf714f90a82bbced8.tar.gz
winrt: Initialize status and position tokens' values in constructor
Doing their initialization near the end of init() is too late because parts of init (namely setUpdateInterval and setPreferredPositioningMethods) rely on them. Change-Id: I81ea1db53aa531248f2c49b8f53f2c33b5fb954e Reviewed-by: Miguel Costa <miguel.costa@qt.io>
-rw-r--r--src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
index 683b383f..a3e8cf5d 100644
--- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
+++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
@@ -132,6 +132,8 @@ QGeoPositionInfoSourceWinRT::QGeoPositionInfoSourceWinRT(QObject *parent)
Q_D(QGeoPositionInfoSourceWinRT);
d->positionError = QGeoPositionInfoSource::NoError;
d->updatesOngoing = false;
+ d->positionToken.value = 0;
+ d->statusToken.value = 0;
}
QGeoPositionInfoSourceWinRT::~QGeoPositionInfoSourceWinRT()
@@ -173,9 +175,6 @@ int QGeoPositionInfoSourceWinRT::init()
return -1;
}
- d->positionToken.value = 0;
- d->statusToken.value = 0;
-
d->periodicTimer.setSingleShot(true);
connect(&d->periodicTimer, &QTimer::timeout, this, &QGeoPositionInfoSourceWinRT::virtualPositionUpdate);