diff options
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/sensors/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/imports/sensors/qmlhumiditysensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmllidsensor.h | 8 | ||||
-rw-r--r-- | src/imports/sensors/qmlsensor.h | 4 | ||||
-rw-r--r-- | src/imports/sensors/sensors.cpp | 5 |
5 files changed, 15 insertions, 12 deletions
diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index 2972b94d..bcad4cc5 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtSensors 5.9' +// 'qmlplugindump -nonrelocatable QtSensors 5.10' Module { dependencies: ["QtQuick 2.8"] diff --git a/src/imports/sensors/qmlhumiditysensor.h b/src/imports/sensors/qmlhumiditysensor.h index 9fc54ac1..a84a428e 100644 --- a/src/imports/sensors/qmlhumiditysensor.h +++ b/src/imports/sensors/qmlhumiditysensor.h @@ -55,8 +55,8 @@ public: ~QmlHumiditySensor(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; + QmlSensorReading *createReading() const override; QHumiditySensor *m_sensor; }; @@ -78,8 +78,8 @@ Q_SIGNALS: void absoluteHumidityChanged(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QHumiditySensor *m_sensor; qreal m_relativeHumidity; diff --git a/src/imports/sensors/qmllidsensor.h b/src/imports/sensors/qmllidsensor.h index caa44ef4..37c2faeb 100644 --- a/src/imports/sensors/qmllidsensor.h +++ b/src/imports/sensors/qmllidsensor.h @@ -53,8 +53,8 @@ public: ~QmlLidSensor(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; + QmlSensorReading *createReading() const override; QLidSensor *m_sensor; }; @@ -76,8 +76,8 @@ Q_SIGNALS: bool frontLidChanged(bool closed); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; QLidSensor *m_sensor; bool m_backClosed; diff --git a/src/imports/sensors/qmlsensor.h b/src/imports/sensors/qmlsensor.h index f74aeeb8..e46278b2 100644 --- a/src/imports/sensors/qmlsensor.h +++ b/src/imports/sensors/qmlsensor.h @@ -167,10 +167,10 @@ private Q_SLOTS: void updateReading(); protected Q_SLOTS: - void componentComplete(); + void componentComplete() override; private: - void classBegin(); + void classBegin() override; virtual void _update(); bool m_parsed; bool m_active; diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index 28f85d37..ffa09d80 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -98,7 +98,7 @@ class QtSensorsDeclarativeModule : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") public: QtSensorsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } - virtual void registerTypes(const char *uri) + void registerTypes(const char *uri) override { char const * const package = "QtSensors"; if (QLatin1String(uri) != QLatin1String(package)) return; @@ -229,6 +229,9 @@ public: minor = 9; qmlRegisterType <QmlLidSensor >(package, major, minor, "LidSensor"); qmlRegisterUncreatableType<QmlLidReading >(package, major, minor, "LidReading", QLatin1String("Cannot create LidReading")); + + // Register the latest Qt version as QML type version + qmlRegisterModule(package, QT_VERSION_MAJOR, QT_VERSION_MINOR); } }; |