summaryrefslogtreecommitdiffstats
path: root/src/sensors
diff options
context:
space:
mode:
Diffstat (limited to 'src/sensors')
-rw-r--r--src/sensors/doc/snippets/sensorgestures/myplugin.h16
-rw-r--r--src/sensors/doc/snippets/sensors/mybackend.h4
-rw-r--r--src/sensors/doc/snippets/sensors/plugin.cpp4
-rw-r--r--src/sensors/doc/src/compatmap.qdoc21
-rw-r--r--src/sensors/gestures/qsensorgesture.h4
-rw-r--r--src/sensors/qaccelerometer.h2
-rw-r--r--src/sensors/qambientlightsensor.h2
-rw-r--r--src/sensors/qhumiditysensor.h2
-rw-r--r--src/sensors/qlidsensor.h2
-rw-r--r--src/sensors/qsensor.h2
-rw-r--r--src/sensors/sensors.pro2
11 files changed, 40 insertions, 21 deletions
diff --git a/src/sensors/doc/snippets/sensorgestures/myplugin.h b/src/sensors/doc/snippets/sensorgestures/myplugin.h
index c03966d0..0cf1a92b 100644
--- a/src/sensors/doc/snippets/sensorgestures/myplugin.h
+++ b/src/sensors/doc/snippets/sensorgestures/myplugin.h
@@ -52,12 +52,12 @@ class MySensorGestureRecognizer : public QSensorGestureRecognizer
MySensorGestureRecognizer(QObject *parent = 0);
~MySensorGestureRecognizer();
- void create();
+ void create() override;
- QString id() const;
- bool start();
- bool stop();
- bool isActive();
+ QString id() const override;
+ bool start() override;
+ bool stop() override;
+ bool isActive() override;
Q_SIGNALS:
// all signals will get exported to QSensorGesture
@@ -74,9 +74,9 @@ public:
explicit MySensorGesturePlugin();
~MySensorGesturePlugin();
- QList <QSensorGestureRecognizer *> createRecognizers();
- QStringList supportedIds() const;
- QString name() const { return "MyGestures"; }
+ QList<QSensorGestureRecognizer *> createRecognizers() override;
+ QStringList supportedIds() const override;
+ QString name() const override { return "MyGestures"; }
};
#endif
diff --git a/src/sensors/doc/snippets/sensors/mybackend.h b/src/sensors/doc/snippets/sensors/mybackend.h
index 2c026dcd..59c54069 100644
--- a/src/sensors/doc/snippets/sensors/mybackend.h
+++ b/src/sensors/doc/snippets/sensors/mybackend.h
@@ -47,8 +47,8 @@ class MyBackend : public QSensorBackend
{
public:
MyBackend(QSensor *sensor) : QSensorBackend(sensor) {}
- void stop() {}
- void start() {}
+ void stop() override {}
+ void start() override {}
void poll() {}
static const char *id;
diff --git a/src/sensors/doc/snippets/sensors/plugin.cpp b/src/sensors/doc/snippets/sensors/plugin.cpp
index d1c30534..1eef5966 100644
--- a/src/sensors/doc/snippets/sensors/plugin.cpp
+++ b/src/sensors/doc/snippets/sensors/plugin.cpp
@@ -50,12 +50,12 @@ class MyPluginClass : public QObject, public QSensorPluginInterface, public QSen
//Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
Q_INTERFACES(QSensorPluginInterface)
public:
- void registerSensors()
+ void registerSensors() override
{
QSensorManager::registerBackend(QAccelerometer::type, MyBackend::id, this);
}
- QSensorBackend *createBackend(QSensor *sensor)
+ QSensorBackend *createBackend(QSensor *sensor) override
{
if (sensor->identifier() == MyBackend::id)
return new MyBackend(sensor);
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index be199602..d91c0c55 100644
--- a/src/sensors/doc/src/compatmap.qdoc
+++ b/src/sensors/doc/src/compatmap.qdoc
@@ -59,6 +59,7 @@
<td><b>Universal Windows Platform</b></td>
<td><b>Generic</b></td>
<td><b>Sensorfw</b></td>
+ <td><b>TI Sensor Tag</b></td>
</tr>
<tr>
<td nowrap="nowrap">Accelerometer</td>
@@ -68,6 +69,7 @@
<td bgcolor="green"></td>
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
+ <td bgcolor="green"></td>
</tr>
<tr>
<td nowrap="nowrap">Altimeter</td>
@@ -77,6 +79,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Ambient Light Sensor</td>
@@ -86,6 +89,7 @@
<td bgcolor="green"></td>
<td bgcolor="green"></td>
<td bgcolor="green"></td>
+ <td bgcolor="green"></td>
</tr>
<tr>
<td nowrap="nowrap">Ambient Temperature Sensor</td>
@@ -95,6 +99,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
+ <td bgcolor="green"></td>
</tr>
<tr>
<td nowrap="nowrap">Compass</td>
@@ -104,6 +109,7 @@
<td bgcolor="green"></td>
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Distance</td>
@@ -113,6 +119,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Gyroscope</td>
@@ -122,6 +129,7 @@
<td bgcolor="green"></td>
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
+ <td bgcolor="green"></td>
</tr>
<tr>
<td nowrap="nowrap">Holster Sensor</td>
@@ -131,6 +139,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Humidity Sensor</td>
@@ -140,6 +149,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
+ <td bgcolor="green"></td>
</tr>
<tr>
<td nowrap="nowrap">IR Proximity Sensor</td>
@@ -149,6 +159,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Lid Sensor</td>
@@ -158,6 +169,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Light Sensor</td>
@@ -167,6 +179,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
+ <td bgcolor="green"></td>
</tr>
<tr>
<td nowrap="nowrap">Magnetometer</td>
@@ -176,6 +189,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
+ <td bgcolor="green"></td>
</tr>
<tr>
<td nowrap="nowrap">Orientation Sensor</td>
@@ -185,6 +199,7 @@
<td bgcolor="green"></td>
<td bgcolor="green"></td>
<td bgcolor="green"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Pressure Sensor</td>
@@ -194,6 +209,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
+ <td bgcolor="green"></td>
</tr>
<tr>
<td nowrap="nowrap">Proximity Sensor</td>
@@ -203,6 +219,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Rotation Sensor</td>
@@ -212,6 +229,7 @@
<td bgcolor="green"></td>
<td bgcolor="green"></td>
<td bgcolor="green"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Tap Sensor</td>
@@ -221,6 +239,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Tilt Sensor</td>
@@ -230,6 +249,7 @@
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
<td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
</tr>
<tr>
<td nowrap="nowrap">Sensor Gestures</td>
@@ -239,6 +259,7 @@
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
<td bgcolor="green"></td>
+ <td bgcolor="gray"></td>
</tr>
</table>
diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h
index 880be69b..dd95b3bd 100644
--- a/src/sensors/gestures/qsensorgesture.h
+++ b/src/sensors/gestures/qsensorgesture.h
@@ -76,8 +76,8 @@ private:
private:
// Pretend to be a Q_OBJECT
- const QMetaObject *metaObject() const;
- int qt_metacall(QMetaObject::Call, int, void **);
+ const QMetaObject *metaObject() const override;
+ int qt_metacall(QMetaObject::Call, int, void **) override;
#ifdef Q_QDOC
Q_SIGNALS:
diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h
index 1911e5fb..a44971f2 100644
--- a/src/sensors/qaccelerometer.h
+++ b/src/sensors/qaccelerometer.h
@@ -69,7 +69,7 @@ class Q_SENSORS_EXPORT QAccelerometerFilter : public QSensorFilter
public:
virtual bool filter(QAccelerometerReading *reading) = 0;
private:
- bool filter(QSensorReading *reading);
+ bool filter(QSensorReading *reading) override;
};
class QAccelerometerPrivate;
diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h
index f9f7d1b1..9d1acec9 100644
--- a/src/sensors/qambientlightsensor.h
+++ b/src/sensors/qambientlightsensor.h
@@ -71,7 +71,7 @@ class Q_SENSORS_EXPORT QAmbientLightFilter : public QSensorFilter
public:
virtual bool filter(QAmbientLightReading *reading) = 0;
private:
- bool filter(QSensorReading *reading);
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QAmbientLightSensor : public QSensor
diff --git a/src/sensors/qhumiditysensor.h b/src/sensors/qhumiditysensor.h
index d916fb73..f24d2be2 100644
--- a/src/sensors/qhumiditysensor.h
+++ b/src/sensors/qhumiditysensor.h
@@ -66,7 +66,7 @@ class Q_SENSORS_EXPORT QHumidityFilter : public QSensorFilter
public:
virtual bool filter(QHumidityReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class QHumiditySensorPrivate;
diff --git a/src/sensors/qlidsensor.h b/src/sensors/qlidsensor.h
index c0f88a79..f7992cac 100644
--- a/src/sensors/qlidsensor.h
+++ b/src/sensors/qlidsensor.h
@@ -69,7 +69,7 @@ class Q_SENSORS_EXPORT QLidFilter : public QSensorFilter
public:
virtual bool filter(QLidReading *reading) = 0;
private:
- bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+ bool filter(QSensorReading *reading) override;
};
class Q_SENSORS_EXPORT QLidSensor : public QSensor
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h
index cf8de767..7dd7ea19 100644
--- a/src/sensors/qsensor.h
+++ b/src/sensors/qsensor.h
@@ -263,7 +263,7 @@ private:
public:\
classname(QObject *parent = Q_NULLPTR);\
virtual ~classname();\
- void copyValuesFrom(QSensorReading *other);\
+ void copyValuesFrom(QSensorReading *other) override;\
private:\
QScopedPointer<pclassname> d;
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
index e66d427f..eaaa73fd 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -13,8 +13,6 @@ qtHaveModule(simulator) {
QMAKE_DOCS = $$PWD/doc/qtsensors.qdocconf
ANDROID_BUNDLED_JAR_DEPENDENCIES = \
- jar/QtSensors-bundled.jar:org.qtproject.qt5.android.sensors.QtSensors
-ANDROID_JAR_DEPENDENCIES = \
jar/QtSensors.jar:org.qtproject.qt5.android.sensors.QtSensors
ANDROID_LIB_DEPENDENCIES = \
plugins/sensors/libqtsensors_android.so
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 14:19:55 +0000