diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 14:12:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 14:12:07 +0200 |
| commit | d5619b17b3133f0aa17331c07ccb9d2b0626d7d6 (patch) | |
| tree | c0c08f35e94f562aa38d7a1338e024eb4424c9a0 /src/positioning | |
| parent | 19642842cea91a4588828362eba023c5da5ab57b (diff) | |
| parent | fafc158427e9d54298ce5c3419c1d4b6ec3b946e (diff) | |
| download | qtlocation-d5619b17b3133f0aa17331c07ccb9d2b0626d7d6.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I1903c3a181663c424f0ff13abcc9fb7a5bdb784e
Diffstat (limited to 'src/positioning')
| -rw-r--r-- | src/positioning/doc/src/qtpositioning.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc index 1ce33085..d5b0eb39 100644 --- a/src/positioning/doc/src/qtpositioning.qdoc +++ b/src/positioning/doc/src/qtpositioning.qdoc @@ -62,7 +62,7 @@ The Qt Positioning API provides positioning information via QML and C++ interfaces. Currently the API is supported on \l {Qt for Android}{Android}, \l {Qt for iOS}{iOS}, -\l {Qt for OS X}{OS X}, +\l {Qt for macOS}{\macos}, \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), |