diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:29:44 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:29:44 +0100 |
commit | f8e256271f919c36c8d97eae27b1d11678294e70 (patch) | |
tree | 774152d663a540dbf0ceb2f1ccb8385842a6e471 /src/sensors/qcompass.cpp | |
parent | 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 (diff) | |
parent | 1e42bf9e28ee0578277047735a5be24fc68abb2c (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/sensors/doc/src/compatmap.qdoc
Change-Id: I7bd464cbd506f630798091fef3896050ade7b3f8
Diffstat (limited to 'src/sensors/qcompass.cpp')
-rw-r--r-- | src/sensors/qcompass.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sensors/qcompass.cpp b/src/sensors/qcompass.cpp index d9527754..5177a177 100644 --- a/src/sensors/qcompass.cpp +++ b/src/sensors/qcompass.cpp @@ -56,7 +56,7 @@ IMPLEMENT_READING(QCompassReading) \section2 QCompassReading Units The compass returns the azimuth of the device as degrees from magnetic north in a clockwise direction based on the top of the device, - as defined by QPlatformScreen::nativeOrientation. + as defined by QScreen::nativeOrientation. There is also a value to indicate the calibration status of the device. If the device is not calibrated the azimuth may not be accurate. @@ -98,7 +98,7 @@ void QCompassReading::setAzimuth(qreal azimuth) \brief the calibration level of the reading. Measured as a value from 0 to 1 with higher values being better. - \sa {QCompassReading Units}, {http://wiki.forum.nokia.com/index.php/CS001671_-_Calibrating_the_magnetometer_sensor}{CS001671 - Calibrating the magnetometer sensor} + \sa {QCompassReading Units} */ qreal QCompassReading::calibrationLevel() const |