summaryrefslogtreecommitdiffstats
path: root/src/sensors/qambientlightsensor.h
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/qambientlightsensor.h
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/qambientlightsensor.h')
-rw-r--r--src/sensors/qambientlightsensor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h
index 9d1acec9..b41fd71e 100644
--- a/src/sensors/qambientlightsensor.h
+++ b/src/sensors/qambientlightsensor.h
@@ -81,7 +81,7 @@ public:
explicit QAmbientLightSensor(QObject *parent = Q_NULLPTR);
virtual ~QAmbientLightSensor();
QAmbientLightReading *reading() const;
- static char const * const type;
+ static char const * const sensorType;
private:
Q_DISABLE_COPY(QAmbientLightSensor)