From d3d6cc54a46e1e7e72e3ca4cfcd837cea678478d Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Fri, 28 May 2021 09:11:11 +0300 Subject: Few cleanups and modernizations This commit introduces few source compatible changes: - Change obsoleted Q_ENUMS => Q_ENUM - Mark QSensor::type property as CONSTANT as it cannot change - Add change signal to QSensor::identifier and a testcase for it Task-number: QTBUG-92505 Change-Id: I6e3a652929d15bc5211448be2ae9254ed6d21118 Reviewed-by: Alex Blasche --- src/sensorsquick/qmlaccelerometer_p.h | 2 +- src/sensorsquick/qmlsensor_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sensorsquick') diff --git a/src/sensorsquick/qmlaccelerometer_p.h b/src/sensorsquick/qmlaccelerometer_p.h index 9dcb2692..24a691d8 100644 --- a/src/sensorsquick/qmlaccelerometer_p.h +++ b/src/sensorsquick/qmlaccelerometer_p.h @@ -60,7 +60,6 @@ class QAccelerometer; class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAccelerometer : public QmlSensor { Q_OBJECT - Q_ENUMS(AccelerationMode) Q_PROPERTY(AccelerationMode accelerationMode READ accelerationMode WRITE setAccelerationMode NOTIFY accelerationModeChanged REVISION 1) QML_NAMED_ELEMENT(Accelerometer) @@ -75,6 +74,7 @@ public: Gravity, User }; + Q_ENUM(AccelerationMode) AccelerationMode accelerationMode() const; void setAccelerationMode(AccelerationMode accelerationMode); diff --git a/src/sensorsquick/qmlsensor_p.h b/src/sensorsquick/qmlsensor_p.h index f31ee1bf..930142b1 100644 --- a/src/sensorsquick/qmlsensor_p.h +++ b/src/sensorsquick/qmlsensor_p.h @@ -71,7 +71,6 @@ class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensor : public QObject, public QQmlParse { Q_OBJECT Q_DECLARE_PRIVATE(QmlSensor) - Q_ENUMS(AxesOrientationMode) Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QString identifier READ identifier WRITE setIdentifier NOTIFY identifierChanged) Q_PROPERTY(QString type READ type NOTIFY typeChanged) @@ -104,6 +103,7 @@ public: AutomaticOrientation, UserOrientation }; + Q_ENUM(AxesOrientationMode) explicit QmlSensor(QObject *parent = 0); ~QmlSensor(); -- cgit v1.2.3