diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:02:27 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:02:34 +0200 |
| commit | 6b5b03c17008fd93e8e152f7e46f1bafe6568018 (patch) | |
| tree | 423bdfcf2fd61ae196bd5625b227db17c8938383 | |
| parent | 0cb5a2f498b38331c6c3bdd5d53777acadd5feea (diff) | |
| parent | 4d1fdf5a94dbef08a90d65403c2f49e12a8753cc (diff) | |
| download | qtlocation-6b5b03c17008fd93e8e152f7e46f1bafe6568018.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
| -rw-r--r-- | src/positioning/doc/src/qtpositioning.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc index 7c30ef07..970bc7bd 100644 --- a/src/positioning/doc/src/qtpositioning.qdoc +++ b/src/positioning/doc/src/qtpositioning.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -69,9 +69,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). 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. +and \l {Qt for UWP}{UWP (Universal Windows Platform)} (using \c {Windows.Devices.Geolocation}). +The Qt for UWP implementation can also be used in Win32 Desktop use cases if the underlying +platform is Windows 10, or later. \section1 Overview |