diff options
authorQt Forward Merge Bot <>2019-07-16 03:02:39 +0200
committerQt Forward Merge Bot <>2019-07-16 03:02:45 +0200
commit6390e165dc2df3bc48c3655ed45d1b952d1f2bae (patch)
parent8a6a24176f68db6cbc10bf66d852e99493607fe1 (diff)
parent0bedb14bb9c7c86e9e5639d03f0dd28a39d54798 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sensors/doc/src/qtsensors-cpp.qdoc b/src/sensors/doc/src/qtsensors-cpp.qdoc
index b0d2726f..d732a0dd 100644
--- a/src/sensors/doc/src/qtsensors-cpp.qdoc
+++ b/src/sensors/doc/src/qtsensors-cpp.qdoc
@@ -56,7 +56,7 @@ Where rotation around an axis is used, the rotation shall be expressed as a Righ
\image sensors-coordinates3.jpg
-In general, sensor data is oriented relative to \l QPlatformScreen::nativeOrientation,
+In general, sensor data is oriented relative to \l QScreen::nativeOrientation,
that is to the top of the device when the device is held in its natural orientation
(normally when the device logo appears the right side up). If values are to be
displayed on the screen, the values may need to be transformed so that they match
diff --git a/src/sensors/qcompass.cpp b/src/sensors/qcompass.cpp
index a24e08e2..5bd2101b 100644
--- a/src/sensors/qcompass.cpp
+++ b/src/sensors/qcompass.cpp
@@ -74,7 +74,7 @@ IMPLEMENT_READING(QCompassReading)
\brief the azimuth of the device.
Measured in degrees from magnetic north in a clockwise direction based on
- the top of the device, as defined by QPlatformScreen::nativeOrientation.
+ the top of the device, as defined by QScreen::nativeOrientation.
\sa {QCompassReading Units}