Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: Idce0f9b94f9e585abfb6903f554500a06f4f8aaa

1 files changed, 21 insertions, 0 deletions

diff --git a/src/imports/sensors/qmlaccelerometer.cpp b/src/imports/sensors/qmlaccelerometer.cpp
index 390f8be..6fc82ea 100644
--- a/src/imports/sensors/qmlaccelerometer.cpp
+++ b/src/imports/sensors/qmlaccelerometer.cpp
@@ -65,12 +65,33 @@ QmlAccelerometer::QmlAccelerometer(QObject *parent)
     : QmlSensor(parent)
     , m_sensor(new QAccelerometer(this))
 {
+    connect(m_sensor, SIGNAL(accelerationModeChanged(AccelerationMode)),
+            this, SIGNAL(accelerationModeChanged(AccelerationMode)));
 }
 
 QmlAccelerometer::~QmlAccelerometer()
 {
 }
 
+/*!
+    \qmlproperty AccelerationMode Accelerometer::accelerationMode
+    \since QtSensors 5.1
+
+    This property holds the current acceleration mode.
+
+    Please see QAccelerometer::accelerationMode for information about this property.
+*/
+
+QmlAccelerometer::AccelerationMode QmlAccelerometer::accelerationMode() const
+{
+    return static_cast<QmlAccelerometer::AccelerationMode>(m_sensor->accelerationMode());
+}
+
+void QmlAccelerometer::setAccelerationMode(QmlAccelerometer::AccelerationMode accelerationMode)
+{
+    m_sensor->setAccelerationMode(static_cast<QAccelerometer::AccelerationMode>(accelerationMode));
+}
+
 QmlSensorReading *QmlAccelerometer::createReading() const
 {
     return new QmlAccelerometerReading(m_sensor);