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/plugins/sensors/generic/generictiltsensor.h | |
| 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/plugins/sensors/generic/generictiltsensor.h')
| -rw-r--r-- | src/plugins/sensors/generic/generictiltsensor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/sensors/generic/generictiltsensor.h b/src/plugins/sensors/generic/generictiltsensor.h index 52c5f7c3..9562acaf 100644 --- a/src/plugins/sensors/generic/generictiltsensor.h +++ b/src/plugins/sensors/generic/generictiltsensor.h @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE class GenericTiltSensor : public QSensorBackend, public QAccelerometerFilter { + Q_OBJECT public: static char const * const id; @@ -57,7 +58,7 @@ public: void start() Q_DECL_OVERRIDE; void stop() Q_DECL_OVERRIDE; - void calibrate(); + Q_INVOKABLE void calibrate(); bool filter(QAccelerometerReading *reading) Q_DECL_OVERRIDE; |