From 3b334c8e10628a362f54651884a6552966e74a02 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Wed, 23 Dec 2015 10:33:43 +0100 Subject: Fix inconsistent use of 'override'. Change-Id: If952d7f9a0888a16c87bc75a96105c5eabc24377 Reviewed-by: Lorn Potter --- src/imports/sensors/qmlrotationsensor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/sensors') diff --git a/src/imports/sensors/qmlrotationsensor.h b/src/imports/sensors/qmlrotationsensor.h index c46c72a6..be745698 100644 --- a/src/imports/sensors/qmlrotationsensor.h +++ b/src/imports/sensors/qmlrotationsensor.h @@ -55,7 +55,7 @@ Q_SIGNALS: private: QSensor *sensor() const Q_DECL_OVERRIDE; - void _update(); + void _update() Q_DECL_OVERRIDE; QRotationSensor *m_sensor; QmlSensorReading *createReading() const Q_DECL_OVERRIDE; }; -- cgit v1.2.3 From ad52d307cbff44b77bf7d4fa923377b72bb04374 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 2 Feb 2016 09:12:01 +0100 Subject: Update qml types for QtSensors 5.6.0 release Change-Id: I9606b50810c63e49f6821e5188df54417601d11a Reviewed-by: Oliver Wolff --- src/imports/sensors/plugins.qmltypes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/sensors') diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index 746230ba..2c72e1ff 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -7,7 +7,7 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable QtSensors 5.6' Module { - dependencies: [] + dependencies: ["QtQuick 2.0"] Component { name: "QmlAccelerometer" prototype: "QmlSensor" -- cgit v1.2.3