Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
	src/sensors/qcompass.cpp

Change-Id: Idfcbbfe1757a4b827663453abc27f4026cd3d752

1 files changed, 4 insertions, 1 deletions

diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
index 76ce38d6..8f949ff1 100644
--- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
@@ -45,8 +45,8 @@ char const * const SensorfwProximitySensor::id("sensorfw.proximitysensor");
 
 SensorfwProximitySensor::SensorfwProximitySensor(QSensor *sensor)
     : SensorfwSensorBase(sensor),
-      m_exClose(false),
       m_initDone(false),
+      m_exClose(false),
       firstRun(true)
 {
     init();
@@ -57,6 +57,8 @@ SensorfwProximitySensor::SensorfwProximitySensor(QSensor *sensor)
 
 void SensorfwProximitySensor::start()
 {
+    if (reinitIsNeeded)
+        init();
     SensorfwSensorBase::start();
 }
 
@@ -75,6 +77,7 @@ void SensorfwProximitySensor::slotDataAvailable(const Unsigned& data)
 
 bool SensorfwProximitySensor::doConnect()
 {
+    Q_ASSERT(m_sensorInterface);
     return (QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(Unsigned)),
                              this, SLOT(slotDataAvailable(Unsigned))));
 }