summaryrefslogtreecommitdiffstats
path: root/src/sensors/doc/src
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-05-12 10:17:24 +0300
committerJuha Vuolle <juha.vuolle@insta.fi>2021-05-19 08:25:33 +0300
commitd70a9906fced63aa1b8502dbdac58d4c244ef956 (patch)
tree0db8326ab7dd36da26e08e0825be01f631cbc3c7 /src/sensors/doc/src
parent8eb9e3dd16c0057f81fa41c001722f31af32dfdf (diff)
Rename subclass static variable which shadowed baseclass method
The 'type' static variable shadowed the 'QSensors::type()' method of the baseclass. While this is easy to workaround it is better to remove such naming clash. Task-number: QTBUG-60246 Change-Id: Id0ddae978377ea4d4d0202a572c554c2541f9364 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/sensors/doc/src')
-rw-r--r--src/sensors/doc/src/qt6-changes.qdoc9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/sensors/doc/src/qt6-changes.qdoc b/src/sensors/doc/src/qt6-changes.qdoc
index e4447a2f..e68aab3e 100644
--- a/src/sensors/doc/src/qt6-changes.qdoc
+++ b/src/sensors/doc/src/qt6-changes.qdoc
@@ -52,4 +52,13 @@
The typedef for the historical, QtMobility-era, 'qtimestamp' has been
removed. Use the actual type 'quint64' directly.
+
+ \section2 Renamed 'sensor' type string to 'sensorType'
+
+ The subclasses of QSensor implement a \e {char const*} string which defines
+ the string that identifies the base sensor. This static \e type field
+ shadowed the baseclass \l QSensor::type() method, leading to unnecessary
+ compilation errors and consequent workarounds. The \e type string has been
+ now renamed as \e sensorType.
+
*/