From d70a9906fced63aa1b8502dbdac58d4c244ef956 Mon Sep 17 00:00:00 2001
From: Juha Vuolle <juha.vuolle@insta.fi>
Date: Wed, 12 May 2021 10:17:24 +0300
Subject: 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>
---
 src/sensors/qlightsensor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/sensors/qlightsensor.h')

diff --git a/src/sensors/qlightsensor.h b/src/sensors/qlightsensor.h
index 03f1871e..642d79cf 100644
--- a/src/sensors/qlightsensor.h
+++ b/src/sensors/qlightsensor.h
@@ -74,7 +74,7 @@ public:
     explicit QLightSensor(QObject *parent = Q_NULLPTR);
     virtual ~QLightSensor();
     QLightReading *reading() const;
-    static char const * const type;
+    static char const * const sensorType;
 
     qreal fieldOfView() const;
     void setFieldOfView(qreal fieldOfView);
-- 
cgit v1.2.3