diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 16:09:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 19:27:43 +0100 |
| commit | 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 (patch) | |
| tree | eff94d6fba0053177b0f6dac2e93b9ce27cbf294 /src/imports | |
| parent | 5e8d2b4e266916761a26905f0930add305c308cf (diff) | |
| parent | fbaca62cd0a7309f04bf82101c8e20dbbf423192 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
src/sensors/doc/src/compatmap.qdoc
Change-Id: I4049bc3c335a8a9db5c935032207d0bcfba78480
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/sensors/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/imports/sensors/qmlrotationsensor.h | 2 |
2 files changed, 2 insertions, 2 deletions
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" diff --git a/src/imports/sensors/qmlrotationsensor.h b/src/imports/sensors/qmlrotationsensor.h index 66da0b7a..0c79c3dd 100644 --- a/src/imports/sensors/qmlrotationsensor.h +++ b/src/imports/sensors/qmlrotationsensor.h @@ -61,7 +61,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; }; |