diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 16:31:30 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 16:32:04 +0200 |
commit | 15e924486a410780fefbc5a95fae8886e3190925 (patch) | |
tree | c6d784f1c528a0fe75367db415240fc4dfe5c73a /src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp | |
parent | ea7af7f00886f77941b81262e597c3b7f3477f48 (diff) | |
parent | 4c29e9149a583b48e563ad44b59666a9d45f9347 (diff) |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
src/sensors/qcompass.cpp
Change-Id: Idfcbbfe1757a4b827663453abc27f4026cd3d752
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp')
-rw-r--r-- | src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp b/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp index b45b7310..722d61b6 100644 --- a/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfworientationsensor.cpp @@ -57,6 +57,8 @@ SensorfwOrientationSensor::SensorfwOrientationSensor(QSensor *sensor) void SensorfwOrientationSensor::start() { + if (reinitIsNeeded) + init(); if (m_sensorInterface) { Unsigned data(((OrientationSensorChannelInterface*)m_sensorInterface)->orientation()); m_reading.setOrientation(SensorfwOrientationSensor::getOrientation(data.x())); @@ -76,6 +78,7 @@ void SensorfwOrientationSensor::slotDataAvailable(const Unsigned& data) bool SensorfwOrientationSensor::doConnect() { + Q_ASSERT(m_sensorInterface); return QObject::connect(m_sensorInterface, SIGNAL(orientationChanged(Unsigned)), this, SLOT(slotDataAvailable(Unsigned))); } |