diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:54:29 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-28 08:38:23 +0100 |
commit | ba9b7b9ef674d93680070f6c4bb1053d0d2325dd (patch) | |
tree | 685b1717d2ff6112149c2797190990dc59053f43 /src/plugins/position/winrt | |
parent | a98315f652518cb6f2d0a2845dc1d1581c3dbbc0 (diff) | |
parent | e2ece6d1283926c5a91362933719f3d10efa2ed5 (diff) | |
download | qtlocation-ba9b7b9ef674d93680070f6c4bb1053d0d2325dd.tar.gz |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
Change-Id: I44fd4bd47f97acd7ca5a0bdb235a701a59497528
Diffstat (limited to 'src/plugins/position/winrt')
-rw-r--r-- | src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp index a1cda7f6..a8e5e201 100644 --- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp +++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp @@ -343,7 +343,7 @@ void QGeoPositionInfoSourceWinRT::virtualPositionUpdate() // We can only do this if we received a valid position before if (d->lastPosition.isValid()) { QGeoPositionInfo sent = d->lastPosition; - sent.setTimestamp(QDateTime::currentDateTime()); + sent.setTimestamp(sent.timestamp().addMSecs(updateInterval())); d->lastPosition = sent; emit positionUpdated(sent); } @@ -498,7 +498,24 @@ HRESULT QGeoPositionInfoSourceWinRT::onPositionChanged(IGeolocator *locator, IPo currentInfo.setAttribute(QGeoPositionInfo::Direction, value); } - currentInfo.setTimestamp(QDateTime::currentDateTime()); + DateTime dateTime; + hr = coord->get_Timestamp(&dateTime); + + if (dateTime.UniversalTime > 0) { + ULARGE_INTEGER uLarge; + uLarge.QuadPart = dateTime.UniversalTime; + FILETIME fileTime; + fileTime.dwHighDateTime = uLarge.HighPart; + fileTime.dwLowDateTime = uLarge.LowPart; + SYSTEMTIME systemTime; + if (FileTimeToSystemTime(&fileTime, &systemTime)) { + currentInfo.setTimestamp(QDateTime(QDate(systemTime.wYear, systemTime.wMonth, + systemTime.wDay), + QTime(systemTime.wHour, systemTime.wMinute, + systemTime.wSecond, systemTime.wMilliseconds), + Qt::UTC)); + } + } emit nativePositionUpdate(currentInfo); |