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

Change-Id: I497c153fe555fbfbbd5fbb40f65f614ee33b065d

1 files changed, 16 insertions, 0 deletions

diff --git a/src/sensors/doc/snippets/sensors/creating.cpp b/src/sensors/doc/snippets/sensors/creating.cpp
index 01e3e36..7988f7e 100644
--- a/src/sensors/doc/snippets/sensors/creating.cpp
+++ b/src/sensors/doc/snippets/sensors/creating.cpp
@@ -40,6 +40,7 @@
 
 #include <QObject>
 #include <qaccelerometer.h>
+#include <qmagnetometer.h>
 #include <qorientationsensor.h>
 
 class MyObject : public QObject
@@ -59,5 +60,20 @@ QOrientationSensor orient_sensor;
 
     Q_UNUSED(sensor)
     Q_UNUSED(orient_sensor);
+
+{
+//! [2]
+QMagnetometer *magnetometer = new QMagnetometer(this);
+//! [2]
+Q_UNUSED(magnetometer);
+}
+
+{
+//! [3]
+QSensor *magnetometer = new QSensor(QMagnetometer::type, this);
+//! [3]
+Q_UNUSED(magnetometer);
+}
+
 }