diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 16:09:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 19:27:43 +0100 |
| commit | 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 (patch) | |
| tree | eff94d6fba0053177b0f6dac2e93b9ce27cbf294 /src/sensors | |
| parent | 5e8d2b4e266916761a26905f0930add305c308cf (diff) | |
| parent | fbaca62cd0a7309f04bf82101c8e20dbbf423192 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
src/sensors/doc/src/compatmap.qdoc
Change-Id: I4049bc3c335a8a9db5c935032207d0bcfba78480
Diffstat (limited to 'src/sensors')
| -rw-r--r-- | src/sensors/doc/src/compatmap.qdoc | 2 | ||||
| -rw-r--r-- | src/sensors/qcompass.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc index 4f45fcbc..f043195c 100644 --- a/src/sensors/doc/src/compatmap.qdoc +++ b/src/sensors/doc/src/compatmap.qdoc @@ -103,7 +103,7 @@ </tr> <tr> <td nowrap="nowrap">Compass</td> - <td bgcolor="gray"></td> + <td bgcolor="green"></td> <td bgcolor="green"></td> <td bgcolor="green"></td> <td bgcolor="green"></td> diff --git a/src/sensors/qcompass.cpp b/src/sensors/qcompass.cpp index f6bea78c..d9527754 100644 --- a/src/sensors/qcompass.cpp +++ b/src/sensors/qcompass.cpp @@ -67,7 +67,6 @@ IMPLEMENT_READING(QCompassReading) The calibration status of the device is measured as a number from 0 to 1. A value of 1 is the highest level that the device can support and 0 is the worst. - \sa {http://wiki.forum.nokia.com/index.php/CS001671_-_Calibrating_the_magnetometer_sensor}{CS001671 - Calibrating the magnetometer sensor} */ /*! |