diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-26 10:02:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-26 10:18:14 +0100 |
| commit | 518633da419d6cfaf603773b9e8c5840e783bc4a (patch) | |
| tree | 326ffd3f5497be64e38fa420af016867ada00538 /src/positioning/doc/src/qtpositioning.qdoc | |
| parent | 9283a290040fd55f7eb34580b99f771d4facdeb4 (diff) | |
| parent | 68b5ee9e7064f66fd7e7bd69b4b51229dbe8cc3c (diff) | |
| download | qtlocation-518633da419d6cfaf603773b9e8c5840e783bc4a.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
tests/plugins/declarativetestplugin/testhelper.h
Change-Id: Ie218ab1dc68642a6922e05e5688c20b90440b72e
Diffstat (limited to 'src/positioning/doc/src/qtpositioning.qdoc')
| -rw-r--r-- | src/positioning/doc/src/qtpositioning.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc index 81de8bec..2a966b19 100644 --- a/src/positioning/doc/src/qtpositioning.qdoc +++ b/src/positioning/doc/src/qtpositioning.qdoc @@ -66,7 +66,9 @@ Currently the API is supported on \l {Qt for Android}{Android}, \l {Qt for iOS}{ \l {Qt for Linux/X11}{Linux} (using \l {http://www.freedesktop.org/wiki/Software/GeoClue}{GeoClue version 0.12.99}), \l {Qt for Windows}{Windows} (with GPS receivers exposed as a serial port providing NMEA sentences), -and \l {Qt for WinRT}{WinRT} (using Windows.Devices.Geolocation). +and \l {Qt for WinRT}{WinRT} (using Windows.Devices.Geolocation). Note that the \l {Qt for WinRT}{WinRT} +implementation can also be used in Win32 Desktop uses cases if the underlying platform is Windows 10 +or later. \section1 Overview |