Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I78c9a02406695ce145b93a46cfa60961e40fc2dc

1 files changed, 7 insertions, 2 deletions

diff --git a/src/plugins/sensors/sensorfw/sensorfwcompass.cpp b/src/plugins/sensors/sensorfw/sensorfwcompass.cpp
index 1fd84417..2cce4898 100644
--- a/src/plugins/sensors/sensorfw/sensorfwcompass.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwcompass.cpp
@@ -43,12 +43,12 @@
 #include "sensorfwcompass.h"
 
 char const * const SensorfwCompass::id("sensorfw.compass");
-bool SensorfwCompass::m_initDone = false;
 
 SensorfwCompass::SensorfwCompass(QSensor *sensor)
     : SensorfwSensorBase(sensor)
+    , m_initDone(false)
 {
-    initSensor<CompassSensorChannelInterface>(m_initDone);
+    init();
     setReading<QCompassReading>(&m_reading);
     sensor->setDataRate(50);//set a default rate
 }
@@ -79,3 +79,8 @@ QString SensorfwCompass::sensorName() const
     return "compasssensor";
 }
 
+void SensorfwCompass::init()
+{
+    m_initDone = false;
+    initSensor<CompassSensorChannelInterface>(m_initDone);
+}