diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:39 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 10:21:39 +0100 |
commit | 19d7ab8d277500e88baf3b23edd62dee4d5d9c46 (patch) | |
tree | b5589d3797c263adc057e2583f9a94e5801b4e21 /src/imports/sensors | |
parent | 26446d7dc33c44e2f84fe95381f02aca87c1a537 (diff) | |
parent | 2c595c382c50a5632b14eda00d85a9b7fcb09b5d (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/sensors/ios/ios.pro
Change-Id: I8d9ca692713c8ba5d8c243371474b0e61630b05e
Diffstat (limited to 'src/imports/sensors')
-rw-r--r-- | src/imports/sensors/qmlaccelerometer.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlaltimeter.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlambientlightsensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlambienttemperaturesensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlcompass.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmldistancesensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlgyroscope.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlholstersensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlirproximitysensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmllightsensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlmagnetometer.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlorientationsensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlpressuresensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlproximitysensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlrotationsensor.h | 10 | ||||
-rw-r--r-- | src/imports/sensors/qmlsensorgesture.h | 4 | ||||
-rw-r--r-- | src/imports/sensors/qmltapsensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmltiltsensor.h | 8 |
18 files changed, 71 insertions, 71 deletions
diff --git a/src/imports/sensors/qmlaccelerometer.h b/src/imports/sensors/qmlaccelerometer.h index 4c759a83..e04b9712 100644 --- a/src/imports/sensors/qmlaccelerometer.h +++ b/src/imports/sensors/qmlaccelerometer.h @@ -70,9 +70,9 @@ signals: Q_REVISION(1) void accelerationModeChanged(AccelerationMode accelerationMode); private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QAccelerometer *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlAccelerometerReading : public QmlSensorReading @@ -95,8 +95,8 @@ Q_SIGNALS: void zChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QAccelerometer *m_sensor; qreal m_x; qreal m_y; diff --git a/src/imports/sensors/qmlaltimeter.h b/src/imports/sensors/qmlaltimeter.h index e16f65aa..04938b53 100644 --- a/src/imports/sensors/qmlaltimeter.h +++ b/src/imports/sensors/qmlaltimeter.h @@ -53,8 +53,8 @@ public: ~QmlAltimeter(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; + QmlSensorReading *createReading() const override; QAltimeter *m_sensor; }; @@ -73,8 +73,8 @@ Q_SIGNALS: void altitudeChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QAltimeter *m_sensor; qreal m_altitude; diff --git a/src/imports/sensors/qmlambientlightsensor.h b/src/imports/sensors/qmlambientlightsensor.h index 5fc1a4e0..4de42f31 100644 --- a/src/imports/sensors/qmlambientlightsensor.h +++ b/src/imports/sensors/qmlambientlightsensor.h @@ -55,9 +55,9 @@ public: ~QmlAmbientLightSensor(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QAmbientLightSensor *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; @@ -76,8 +76,8 @@ Q_SIGNALS: void lightLevelChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QAmbientLightSensor *m_sensor; QAmbientLightReading::LightLevel m_lightLevel; }; diff --git a/src/imports/sensors/qmlambienttemperaturesensor.h b/src/imports/sensors/qmlambienttemperaturesensor.h index 0171da40..31ec72fa 100644 --- a/src/imports/sensors/qmlambienttemperaturesensor.h +++ b/src/imports/sensors/qmlambienttemperaturesensor.h @@ -53,8 +53,8 @@ public: ~QmlAmbientTemperatureSensor(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; + QmlSensorReading *createReading() const override; QAmbientTemperatureSensor *m_sensor; }; @@ -73,8 +73,8 @@ Q_SIGNALS: void temperatureChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QAmbientTemperatureSensor *m_sensor; qreal m_temperature; diff --git a/src/imports/sensors/qmlcompass.h b/src/imports/sensors/qmlcompass.h index cd5de19d..ef4fd22f 100644 --- a/src/imports/sensors/qmlcompass.h +++ b/src/imports/sensors/qmlcompass.h @@ -55,9 +55,9 @@ public: private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QCompass *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlCompassReading : public QmlSensorReading @@ -77,8 +77,8 @@ Q_SIGNALS: void calibrationLevelChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QCompass *m_sensor; qreal m_azimuth; qreal m_calibrationLevel; diff --git a/src/imports/sensors/qmldistancesensor.h b/src/imports/sensors/qmldistancesensor.h index a7635f53..e60e0e7e 100644 --- a/src/imports/sensors/qmldistancesensor.h +++ b/src/imports/sensors/qmldistancesensor.h @@ -54,8 +54,8 @@ public: ~QmlDistanceSensor(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; + QmlSensorReading *createReading() const override; QDistanceSensor *m_sensor; }; @@ -74,8 +74,8 @@ Q_SIGNALS: void distanceChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QDistanceSensor *m_sensor; qreal m_distance; diff --git a/src/imports/sensors/qmlgyroscope.h b/src/imports/sensors/qmlgyroscope.h index 9d3f5c79..010e4f04 100644 --- a/src/imports/sensors/qmlgyroscope.h +++ b/src/imports/sensors/qmlgyroscope.h @@ -55,9 +55,9 @@ public: private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QGyroscope *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlGyroscopeReading : public QmlSensorReading @@ -80,8 +80,8 @@ Q_SIGNALS: void zChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QGyroscope *m_sensor; qreal m_x; qreal m_y; diff --git a/src/imports/sensors/qmlholstersensor.h b/src/imports/sensors/qmlholstersensor.h index 8b6eef73..630d1d85 100644 --- a/src/imports/sensors/qmlholstersensor.h +++ b/src/imports/sensors/qmlholstersensor.h @@ -53,8 +53,8 @@ public: ~QmlHolsterSensor(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; + QmlSensorReading *createReading() const override; QHolsterSensor *m_sensor; }; @@ -73,8 +73,8 @@ Q_SIGNALS: void holsteredChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QHolsterSensor *m_sensor; bool m_holstered; diff --git a/src/imports/sensors/qmlirproximitysensor.h b/src/imports/sensors/qmlirproximitysensor.h index 054451bc..8ba1d489 100644 --- a/src/imports/sensors/qmlirproximitysensor.h +++ b/src/imports/sensors/qmlirproximitysensor.h @@ -54,9 +54,9 @@ public: ~QmlIRProximitySensor(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QIRProximitySensor *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlIRProximitySensorReading : public QmlSensorReading @@ -73,8 +73,8 @@ Q_SIGNALS: void reflectanceChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QIRProximitySensor *m_sensor; qreal m_reflectance; }; diff --git a/src/imports/sensors/qmllightsensor.h b/src/imports/sensors/qmllightsensor.h index abc886b2..c77b4bfe 100644 --- a/src/imports/sensors/qmllightsensor.h +++ b/src/imports/sensors/qmllightsensor.h @@ -60,9 +60,9 @@ Q_SIGNALS: void fieldOfViewChanged(qreal fieldOfView); private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QLightSensor *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlLightSensorReading : public QmlSensorReading @@ -79,8 +79,8 @@ Q_SIGNALS: void illuminanceChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QLightSensor *m_sensor; qreal m_illuminance; }; diff --git a/src/imports/sensors/qmlmagnetometer.h b/src/imports/sensors/qmlmagnetometer.h index e55a3659..3c3c2bae 100644 --- a/src/imports/sensors/qmlmagnetometer.h +++ b/src/imports/sensors/qmlmagnetometer.h @@ -61,9 +61,9 @@ Q_SIGNALS: void returnGeoValuesChanged(bool returnGeoValues); private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QMagnetometer *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlMagnetometerReading : public QmlSensorReading @@ -89,8 +89,8 @@ Q_SIGNALS: void calibrationLevelChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QMagnetometer *m_sensor; qreal m_x; qreal m_y; diff --git a/src/imports/sensors/qmlorientationsensor.h b/src/imports/sensors/qmlorientationsensor.h index 896279d0..bdb1b1e4 100644 --- a/src/imports/sensors/qmlorientationsensor.h +++ b/src/imports/sensors/qmlorientationsensor.h @@ -56,9 +56,9 @@ public: private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QOrientationSensor *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlOrientationSensorReading : public QmlSensorReading @@ -76,8 +76,8 @@ Q_SIGNALS: void orientationChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QOrientationSensor *m_sensor; QOrientationReading::Orientation m_orientation; }; diff --git a/src/imports/sensors/qmlpressuresensor.h b/src/imports/sensors/qmlpressuresensor.h index 4a99b461..6304d69c 100644 --- a/src/imports/sensors/qmlpressuresensor.h +++ b/src/imports/sensors/qmlpressuresensor.h @@ -53,8 +53,8 @@ public: ~QmlPressureSensor(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; + QmlSensorReading *createReading() const override; QPressureSensor *m_sensor; }; @@ -76,8 +76,8 @@ Q_SIGNALS: Q_REVISION(1) void temperatureChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QPressureSensor *m_sensor; qreal m_pressure; diff --git a/src/imports/sensors/qmlproximitysensor.h b/src/imports/sensors/qmlproximitysensor.h index c785dd87..8bab8cfa 100644 --- a/src/imports/sensors/qmlproximitysensor.h +++ b/src/imports/sensors/qmlproximitysensor.h @@ -57,9 +57,9 @@ public: private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QProximitySensor *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlProximitySensorReading : public QmlSensorReading @@ -76,8 +76,8 @@ Q_SIGNALS: void nearChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QProximitySensor *m_sensor; bool m_near; }; diff --git a/src/imports/sensors/qmlrotationsensor.h b/src/imports/sensors/qmlrotationsensor.h index 0c79c3dd..c0760ac9 100644 --- a/src/imports/sensors/qmlrotationsensor.h +++ b/src/imports/sensors/qmlrotationsensor.h @@ -60,10 +60,10 @@ Q_SIGNALS: void hasZChanged(bool hasZ); private: - QSensor *sensor() const Q_DECL_OVERRIDE; - void _update() Q_DECL_OVERRIDE; + QSensor *sensor() const override; + void _update() override; QRotationSensor *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlRotationSensorReading : public QmlSensorReading @@ -86,8 +86,8 @@ Q_SIGNALS: void zChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QRotationSensor *m_sensor; qreal m_x; qreal m_y; diff --git a/src/imports/sensors/qmlsensorgesture.h b/src/imports/sensors/qmlsensorgesture.h index ec50a463..7cd4acaa 100644 --- a/src/imports/sensors/qmlsensorgesture.h +++ b/src/imports/sensors/qmlsensorgesture.h @@ -61,8 +61,8 @@ class QmlSensorGesture : public QObject, public QQmlParserStatus public: explicit QmlSensorGesture(QObject* parent = 0); ~QmlSensorGesture(); - void classBegin() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void classBegin() override; + void componentComplete() override; Q_SIGNALS: void detected(const QString &gesture); diff --git a/src/imports/sensors/qmltapsensor.h b/src/imports/sensors/qmltapsensor.h index c5f560ac..260cb2c2 100644 --- a/src/imports/sensors/qmltapsensor.h +++ b/src/imports/sensors/qmltapsensor.h @@ -62,9 +62,9 @@ Q_SIGNALS: void returnDoubleTapEventsChanged(bool returnDoubleTapEvents); private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QTapSensor *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlTapSensorReading : public QmlSensorReading @@ -85,8 +85,8 @@ Q_SIGNALS: void isDoubleTapChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QTapSensor *m_sensor; QTapReading::TapDirection m_tapDirection; bool m_isDoubleTap; diff --git a/src/imports/sensors/qmltiltsensor.h b/src/imports/sensors/qmltiltsensor.h index 548ff578..c922cb8c 100644 --- a/src/imports/sensors/qmltiltsensor.h +++ b/src/imports/sensors/qmltiltsensor.h @@ -57,9 +57,9 @@ public: Q_INVOKABLE void calibrate(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; QTiltSensor *m_sensor; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const override; }; class QmlTiltSensorReading : public QmlSensorReading @@ -79,8 +79,8 @@ Q_SIGNALS: void xRotationChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QTiltSensor *m_sensor; qreal m_yRotation; qreal m_xRotation; |