diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 16:31:30 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 16:32:04 +0200 |
| commit | 15e924486a410780fefbc5a95fae8886e3190925 (patch) | |
| tree | c6d784f1c528a0fe75367db415240fc4dfe5c73a /src/sensors/qcompass.cpp | |
| parent | ea7af7f00886f77941b81262e597c3b7f3477f48 (diff) | |
| parent | 4c29e9149a583b48e563ad44b59666a9d45f9347 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
src/sensors/qcompass.cpp
Change-Id: Idfcbbfe1757a4b827663453abc27f4026cd3d752
Diffstat (limited to 'src/sensors/qcompass.cpp')
| -rw-r--r-- | src/sensors/qcompass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sensors/qcompass.cpp b/src/sensors/qcompass.cpp index 6564d362..468668ff 100644 --- a/src/sensors/qcompass.cpp +++ b/src/sensors/qcompass.cpp @@ -75,7 +75,7 @@ IMPLEMENT_READING(QCompassReading) \property QCompassReading::azimuth \brief the azimuth of the device. - Measured in degrees from magnetic north in a clockwise direction based + Measured in degrees from magnetic north in a clockwise direction based on the top of the device, as defined by QPlatformScreen::nativeOrientation. \sa {QCompassReading Units} */ |