diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-09-04 10:19:36 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-09-10 13:50:59 +0000 |
| commit | d1964046bc55e5b4d99a509c6329f549c47d3f77 (patch) | |
| tree | 5db60094f9e06914364c94dc434f43c26d24c31f | |
| parent | 57c69619de0ae9981fc5f5d7e0bcdb3f7f146d5c (diff) | |
| download | qtlocation-d1964046bc55e5b4d99a509c6329f549c47d3f77.tar.gz | |
Enable positioning for OS X
Core Location works just fine.
Add also a helpful hint to the "unknown" error that comes when Wi-Fi is
turned off.
Change-Id: I0240f1e070217e19aff4c9329d680dd9991b74b1
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | src/plugins/position/corelocation/qgeopositioninfosource_cl.mm | 4 | ||||
| -rw-r--r-- | src/plugins/position/position.pro | 2 | ||||
| -rw-r--r-- | src/positioning/doc/src/qtpositioning.qdoc | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm index c92e468f..0e5e261b 100644 --- a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm +++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm @@ -88,6 +88,10 @@ m_positionInfoSource->setError(QGeoPositionInfoSource::AccessError); qWarning() << QString::fromNSString([error localizedDescription]); + + if ([error code] == 0 + && QString::fromNSString([error domain]) == QStringLiteral("kCLErrorDomain")) + qWarning() << "(is Wi-Fi turned on?)"; } @end diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro index 6a6264e2..3886eb4d 100644 --- a/src/plugins/position/position.pro +++ b/src/plugins/position/position.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs qtHaveModule(dbus):SUBDIRS += geoclue config_gypsy:SUBDIRS += gypsy qtHaveModule(simulator):SUBDIRS += simulator -ios:SUBDIRS += corelocation +osx|ios:SUBDIRS += corelocation android:!android-no-sdk:SUBDIRS += android winrt:SUBDIRS += winrt diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc index 95a267ab..c80ae8e1 100644 --- a/src/positioning/doc/src/qtpositioning.qdoc +++ b/src/positioning/doc/src/qtpositioning.qdoc @@ -62,6 +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 Linux/X11}{Linux} (using \l {http://www.freedesktop.org/wiki/Software/GeoClue}{GeoClue version 0.12.99}) and \l {Qt for WinRT}{WinRT}. |