Merge branch 'stable' into dev

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I0eaa022110b99fc5bc7cdf6304b5cda3ad3e8f8c

2 files changed, 135 insertions, 40 deletions

diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index 2deff792..f461372f 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -3,13 +3,16 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command 'qmlplugindump QtSensors 5.0 /home/thomas/src/qtbase/qml'.
+// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtSensors 5.1'.
 
 Module {
     Component {
         name: "QmlAccelerometer"
         prototype: "QmlSensor"
-        exports: ["Accelerometer 5.0", "Accelerometer 5.1"]
+        exports: [
+            "QtSensors/Accelerometer 5.0",
+            "QtSensors/Accelerometer 5.1"
+        ]
         exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "AccelerationMode"
@@ -22,13 +25,18 @@ Module {
         Property { name: "accelerationMode"; revision: 1; type: "AccelerationMode" }
         Signal {
             name: "accelerationModeChanged"
+            revision: 1
             Parameter { name: "accelerationMode"; type: "AccelerationMode" }
         }
     }
     Component {
         name: "QmlAccelerometerReading"
         prototype: "QmlSensorReading"
-        exports: ["AccelerometerReading 5.0", "AccelerometerReading 5.1"]
+        exports: [
+            "QtSensors/AccelerometerReading 5.0",
+            "QtSensors/AccelerometerReading 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "x"; type: "double"; isReadonly: true }
         Property { name: "y"; type: "double"; isReadonly: true }
         Property { name: "z"; type: "double"; isReadonly: true }
@@ -36,57 +44,79 @@ Module {
     Component {
         name: "QmlAltimeter"
         prototype: "QmlSensor"
-        exports: ["Altimeter 5.1"]
+        exports: ["QtSensors/Altimeter 5.1"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QmlAltimeterReading"
         prototype: "QmlSensorReading"
-        exports: ["AltimeterReading 5.1"]
+        exports: ["QtSensors/AltimeterReading 5.1"]
+        exportMetaObjectRevisions: [0]
         Property { name: "altitude"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QmlAmbientLightSensor"
         prototype: "QmlSensor"
-        exports: ["AmbientLightSensor 5.0", "AmbientLightSensor 5.1"]
+        exports: [
+            "QtSensors/AmbientLightSensor 5.0",
+            "QtSensors/AmbientLightSensor 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
     }
     Component {
         name: "QmlAmbientLightSensorReading"
         prototype: "QmlSensorReading"
-        exports: ["AmbientLightReading 5.0", "AmbientLightReading 5.1"]
+        exports: [
+            "QtSensors/AmbientLightReading 5.0",
+            "QtSensors/AmbientLightReading 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "lightLevel"; type: "QAmbientLightReading::LightLevel"; isReadonly: true }
     }
     Component {
         name: "QmlAmbientTemperatureReading"
         prototype: "QmlSensorReading"
-        exports: ["AmbientTemperatureReading 5.1"]
+        exports: ["QtSensors/AmbientTemperatureReading 5.1"]
+        exportMetaObjectRevisions: [0]
         Property { name: "temperature"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QmlAmbientTemperatureSensor"
         prototype: "QmlSensor"
-        exports: ["AmbientTemperatureSensor 5.1"]
+        exports: ["QtSensors/AmbientTemperatureSensor 5.1"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QmlCompass"
         prototype: "QmlSensor"
-        exports: ["Compass 5.0", "Compass 5.1"]
+        exports: ["QtSensors/Compass 5.0", "QtSensors/Compass 5.1"]
+        exportMetaObjectRevisions: [0, 0]
     }
     Component {
         name: "QmlCompassReading"
         prototype: "QmlSensorReading"
-        exports: ["CompassReading 5.0", "CompassReading 5.1"]
+        exports: [
+            "QtSensors/CompassReading 5.0",
+            "QtSensors/CompassReading 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "azimuth"; type: "double"; isReadonly: true }
         Property { name: "calibrationLevel"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QmlGyroscope"
         prototype: "QmlSensor"
-        exports: ["Gyroscope 5.0", "Gyroscope 5.1"]
+        exports: ["QtSensors/Gyroscope 5.0", "QtSensors/Gyroscope 5.1"]
+        exportMetaObjectRevisions: [0, 0]
     }
     Component {
         name: "QmlGyroscopeReading"
         prototype: "QmlSensorReading"
-        exports: ["GyroscopeReading 5.0", "GyroscopeReading 5.1"]
+        exports: [
+            "QtSensors/GyroscopeReading 5.0",
+            "QtSensors/GyroscopeReading 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "x"; type: "double"; isReadonly: true }
         Property { name: "y"; type: "double"; isReadonly: true }
         Property { name: "z"; type: "double"; isReadonly: true }
@@ -94,29 +124,40 @@ Module {
     Component {
         name: "QmlHolsterReading"
         prototype: "QmlSensorReading"
-        exports: ["HolsterReading 5.1"]
+        exports: ["QtSensors/HolsterReading 5.1"]
+        exportMetaObjectRevisions: [0]
         Property { name: "holstered"; type: "bool"; isReadonly: true }
     }
     Component {
         name: "QmlHolsterSensor"
         prototype: "QmlSensor"
-        exports: ["HolsterSensor 5.1"]
+        exports: ["QtSensors/HolsterSensor 5.1"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QmlIRProximitySensor"
         prototype: "QmlSensor"
-        exports: ["IRProximitySensor 5.0", "IRProximitySensor 5.1"]
+        exports: [
+            "QtSensors/IRProximitySensor 5.0",
+            "QtSensors/IRProximitySensor 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
     }
     Component {
         name: "QmlIRProximitySensorReading"
         prototype: "QmlSensorReading"
-        exports: ["IRProximityReading 5.0", "IRProximityReading 5.1"]
+        exports: [
+            "QtSensors/IRProximityReading 5.0",
+            "QtSensors/IRProximityReading 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "reflectance"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QmlLightSensor"
         prototype: "QmlSensor"
-        exports: ["LightSensor 5.0", "LightSensor 5.1"]
+        exports: ["QtSensors/LightSensor 5.0", "QtSensors/LightSensor 5.1"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "fieldOfView"; type: "double"; isReadonly: true }
         Signal {
             name: "fieldOfViewChanged"
@@ -126,13 +167,15 @@ Module {
     Component {
         name: "QmlLightSensorReading"
         prototype: "QmlSensorReading"
-        exports: ["LightReading 5.0", "LightReading 5.1"]
+        exports: ["QtSensors/LightReading 5.0", "QtSensors/LightReading 5.1"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "illuminance"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QmlMagnetometer"
         prototype: "QmlSensor"
-        exports: ["Magnetometer 5.0", "Magnetometer 5.1"]
+        exports: ["QtSensors/Magnetometer 5.0", "QtSensors/Magnetometer 5.1"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "returnGeoValues"; type: "bool" }
         Signal {
             name: "returnGeoValuesChanged"
@@ -142,7 +185,11 @@ Module {
     Component {
         name: "QmlMagnetometerReading"
         prototype: "QmlSensorReading"
-        exports: ["MagnetometerReading 5.0", "MagnetometerReading 5.1"]
+        exports: [
+            "QtSensors/MagnetometerReading 5.0",
+            "QtSensors/MagnetometerReading 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "x"; type: "double"; isReadonly: true }
         Property { name: "y"; type: "double"; isReadonly: true }
         Property { name: "z"; type: "double"; isReadonly: true }
@@ -151,40 +198,62 @@ Module {
     Component {
         name: "QmlOrientationSensor"
         prototype: "QmlSensor"
-        exports: ["OrientationSensor 5.0", "OrientationSensor 5.1"]
+        exports: [
+            "QtSensors/OrientationSensor 5.0",
+            "QtSensors/OrientationSensor 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
     }
     Component {
         name: "QmlOrientationSensorReading"
         prototype: "QmlSensorReading"
-        exports: ["OrientationReading 5.0", "OrientationReading 5.1"]
+        exports: [
+            "QtSensors/OrientationReading 5.0",
+            "QtSensors/OrientationReading 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "orientation"; type: "QOrientationReading::Orientation"; isReadonly: true }
     }
     Component {
         name: "QmlPressureReading"
         prototype: "QmlSensorReading"
-        exports: ["PressureReading 5.1"]
+        exports: ["QtSensors/PressureReading 5.1"]
+        exportMetaObjectRevisions: [0]
         Property { name: "pressure"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QmlPressureSensor"
         prototype: "QmlSensor"
-        exports: ["PressureSensor 5.1"]
+        exports: ["QtSensors/PressureSensor 5.1"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QmlProximitySensor"
         prototype: "QmlSensor"
-        exports: ["ProximitySensor 5.0", "ProximitySensor 5.1"]
+        exports: [
+            "QtSensors/ProximitySensor 5.0",
+            "QtSensors/ProximitySensor 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
     }
     Component {
         name: "QmlProximitySensorReading"
         prototype: "QmlSensorReading"
-        exports: ["ProximityReading 5.0", "ProximityReading 5.1"]
+        exports: [
+            "QtSensors/ProximityReading 5.0",
+            "QtSensors/ProximityReading 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "near"; type: "bool"; isReadonly: true }
     }
     Component {
         name: "QmlRotationSensor"
         prototype: "QmlSensor"
-        exports: ["RotationSensor 5.0", "RotationSensor 5.1"]
+        exports: [
+            "QtSensors/RotationSensor 5.0",
+            "QtSensors/RotationSensor 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "hasZ"; type: "bool"; isReadonly: true }
         Signal {
             name: "hasZChanged"
@@ -194,7 +263,11 @@ Module {
     Component {
         name: "QmlRotationSensorReading"
         prototype: "QmlSensorReading"
-        exports: ["RotationReading 5.0", "RotationReading 5.1"]
+        exports: [
+            "QtSensors/RotationReading 5.0",
+            "QtSensors/RotationReading 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "x"; type: "double"; isReadonly: true }
         Property { name: "y"; type: "double"; isReadonly: true }
         Property { name: "z"; type: "double"; isReadonly: true }
@@ -202,7 +275,7 @@ Module {
     Component {
         name: "QmlSensor"
         prototype: "QObject"
-        exports: ["Sensor 5.0", "Sensor 5.1"]
+        exports: ["QtSensors/Sensor 5.0", "QtSensors/Sensor 5.1"]
         exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "AxesOrientationMode"
@@ -234,30 +307,37 @@ Module {
         Property { name: "bufferSize"; revision: 1; type: "int" }
         Signal {
             name: "skipDuplicatesChanged"
+            revision: 1
             Parameter { name: "skipDuplicates"; type: "bool" }
         }
         Signal {
             name: "axesOrientationModeChanged"
+            revision: 1
             Parameter { name: "axesOrientationMode"; type: "AxesOrientationMode" }
         }
         Signal {
             name: "currentOrientationChanged"
+            revision: 1
             Parameter { name: "currentOrientation"; type: "int" }
         }
         Signal {
             name: "userOrientationChanged"
+            revision: 1
             Parameter { name: "userOrientation"; type: "int" }
         }
         Signal {
             name: "maxBufferSizeChanged"
+            revision: 1
             Parameter { name: "maxBufferSize"; type: "int" }
         }
         Signal {
             name: "efficientBufferSizeChanged"
+            revision: 1
             Parameter { name: "efficientBufferSize"; type: "int" }
         }
         Signal {
             name: "bufferSizeChanged"
+            revision: 1
             Parameter { name: "bufferSize"; type: "int" }
         }
         Method { name: "start"; type: "bool" }
@@ -266,7 +346,11 @@ Module {
     Component {
         name: "QmlSensorGesture"
         prototype: "QObject"
-        exports: ["SensorGesture 5.0", "SensorGesture 5.1"]
+        exports: [
+            "QtSensors/SensorGesture 5.0",
+            "QtSensors/SensorGesture 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "availableGestures"; type: "QStringList"; isReadonly: true }
         Property { name: "gestures"; type: "QStringList" }
         Property { name: "validGestures"; type: "QStringList"; isReadonly: true }
@@ -280,7 +364,8 @@ Module {
     Component {
         name: "QmlSensorGlobal"
         prototype: "QObject"
-        exports: ["QmlSensors 5.0", "QmlSensors 5.1"]
+        exports: ["QtSensors/QmlSensors 5.0", "QtSensors/QmlSensors 5.1"]
+        exportMetaObjectRevisions: [0, 0]
         Signal { name: "availableSensorsChanged" }
         Method { name: "sensorTypes"; type: "QStringList" }
         Method {
@@ -297,7 +382,8 @@ Module {
     Component {
         name: "QmlSensorOutputRange"
         prototype: "QObject"
-        exports: ["OutputRange 5.0", "OutputRange 5.1"]
+        exports: ["QtSensors/OutputRange 5.0", "QtSensors/OutputRange 5.1"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "minimum"; type: "double"; isReadonly: true }
         Property { name: "maximum"; type: "double"; isReadonly: true }
         Property { name: "accuracy"; type: "double"; isReadonly: true }
@@ -305,20 +391,26 @@ Module {
     Component {
         name: "QmlSensorRange"
         prototype: "QObject"
-        exports: ["Range 5.0", "Range 5.1"]
+        exports: ["QtSensors/Range 5.0", "QtSensors/Range 5.1"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "minimum"; type: "int"; isReadonly: true }
         Property { name: "maximum"; type: "int"; isReadonly: true }
     }
     Component {
         name: "QmlSensorReading"
         prototype: "QObject"
-        exports: ["SensorReading 5.0", "SensorReading 5.1"]
+        exports: [
+            "QtSensors/SensorReading 5.0",
+            "QtSensors/SensorReading 5.1"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "timestamp"; type: "qulonglong"; isReadonly: true }
     }
     Component {
         name: "QmlTapSensor"
         prototype: "QmlSensor"
-        exports: ["TapSensor 5.0", "TapSensor 5.1"]
+        exports: ["QtSensors/TapSensor 5.0", "QtSensors/TapSensor 5.1"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "returnDoubleTapEvents"; type: "bool" }
         Signal {
             name: "returnDoubleTapEventsChanged"
@@ -328,7 +420,8 @@ Module {
     Component {
         name: "QmlTapSensorReading"
         prototype: "QmlSensorReading"
-        exports: ["TapReading 5.0", "TapReading 5.1"]
+        exports: ["QtSensors/TapReading 5.0", "QtSensors/TapReading 5.1"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "tapDirection"; type: "QTapReading::TapDirection"; isReadonly: true }
         Property { name: "doubleTap"; type: "bool"; isReadonly: true }
         Signal { name: "isDoubleTapChanged" }
@@ -336,13 +429,15 @@ Module {
     Component {
         name: "QmlTiltSensor"
         prototype: "QmlSensor"
-        exports: ["TiltSensor 5.0", "TiltSensor 5.1"]
+        exports: ["QtSensors/TiltSensor 5.0", "QtSensors/TiltSensor 5.1"]
+        exportMetaObjectRevisions: [0, 0]
         Method { name: "calibrate" }
     }
     Component {
         name: "QmlTiltSensorReading"
         prototype: "QmlSensorReading"
-        exports: ["TiltReading 5.0", "TiltReading 5.1"]
+        exports: ["QtSensors/TiltReading 5.0", "QtSensors/TiltReading 5.1"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "yRotation"; type: "double"; isReadonly: true }
         Property { name: "xRotation"; type: "double"; isReadonly: true }
     }
diff --git a/src/imports/sensors/qmlholstersensor.cpp b/src/imports/sensors/qmlholstersensor.cpp
index a1eae05b..d952e81c 100644
--- a/src/imports/sensors/qmlholstersensor.cpp
+++ b/src/imports/sensors/qmlholstersensor.cpp
@@ -125,7 +125,7 @@ QSensorReading *QmlHolsterReading::reading() const
 
 void QmlHolsterReading::readingUpdate()
 {
-    qreal holstered = m_sensor->reading()->holstered();
+    const bool holstered = m_sensor->reading()->holstered();
     if (m_holstered != holstered) {
         m_holstered = holstered;
         Q_EMIT holsteredChanged();