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

Change-Id: I3305a1b8bf20b36ad614d1d0492d6a81eb99278a

9 files changed, 214 insertions, 88 deletions

diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index f461372f..0790533d 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -3,7 +3,8 @@ 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 -notrelocatable QtSensors 5.1'.
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable QtSensors 5.3'
 
 Module {
     Component {
@@ -11,9 +12,10 @@ Module {
         prototype: "QmlSensor"
         exports: [
             "QtSensors/Accelerometer 5.0",
-            "QtSensors/Accelerometer 5.1"
+            "QtSensors/Accelerometer 5.1",
+            "QtSensors/Accelerometer 5.2"
         ]
-        exportMetaObjectRevisions: [0, 1]
+        exportMetaObjectRevisions: [0, 1, 1]
         Enum {
             name: "AccelerationMode"
             values: {
@@ -34,9 +36,11 @@ Module {
         prototype: "QmlSensorReading"
         exports: [
             "QtSensors/AccelerometerReading 5.0",
-            "QtSensors/AccelerometerReading 5.1"
+            "QtSensors/AccelerometerReading 5.1",
+            "QtSensors/AccelerometerReading 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "x"; type: "double"; isReadonly: true }
         Property { name: "y"; type: "double"; isReadonly: true }
         Property { name: "z"; type: "double"; isReadonly: true }
@@ -44,14 +48,22 @@ Module {
     Component {
         name: "QmlAltimeter"
         prototype: "QmlSensor"
-        exports: ["QtSensors/Altimeter 5.1"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtSensors/Altimeter 5.1",
+            "QtSensors/Altimeter 5.2",
+            "QtSensors/Altimeter 5.3"
+        ]
+        exportMetaObjectRevisions: [0, 0, 0]
     }
     Component {
         name: "QmlAltimeterReading"
         prototype: "QmlSensorReading"
-        exports: ["QtSensors/AltimeterReading 5.1"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtSensors/AltimeterReading 5.1",
+            "QtSensors/AltimeterReading 5.2"
+        ]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "altitude"; type: "double"; isReadonly: true }
     }
     Component {
@@ -59,64 +71,86 @@ Module {
         prototype: "QmlSensor"
         exports: [
             "QtSensors/AmbientLightSensor 5.0",
-            "QtSensors/AmbientLightSensor 5.1"
+            "QtSensors/AmbientLightSensor 5.1",
+            "QtSensors/AmbientLightSensor 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        exportMetaObjectRevisions: [0, 0, 0]
     }
     Component {
         name: "QmlAmbientLightSensorReading"
         prototype: "QmlSensorReading"
         exports: [
             "QtSensors/AmbientLightReading 5.0",
-            "QtSensors/AmbientLightReading 5.1"
+            "QtSensors/AmbientLightReading 5.1",
+            "QtSensors/AmbientLightReading 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "lightLevel"; type: "QAmbientLightReading::LightLevel"; isReadonly: true }
     }
     Component {
         name: "QmlAmbientTemperatureReading"
         prototype: "QmlSensorReading"
-        exports: ["QtSensors/AmbientTemperatureReading 5.1"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtSensors/AmbientTemperatureReading 5.1",
+            "QtSensors/AmbientTemperatureReading 5.2"
+        ]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "temperature"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QmlAmbientTemperatureSensor"
         prototype: "QmlSensor"
-        exports: ["QtSensors/AmbientTemperatureSensor 5.1"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtSensors/AmbientTemperatureSensor 5.1",
+            "QtSensors/AmbientTemperatureSensor 5.2"
+        ]
+        exportMetaObjectRevisions: [0, 0]
     }
     Component {
         name: "QmlCompass"
         prototype: "QmlSensor"
-        exports: ["QtSensors/Compass 5.0", "QtSensors/Compass 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/Compass 5.0",
+            "QtSensors/Compass 5.1",
+            "QtSensors/Compass 5.2"
+        ]
+        exportMetaObjectRevisions: [0, 0, 0]
     }
     Component {
         name: "QmlCompassReading"
         prototype: "QmlSensorReading"
         exports: [
             "QtSensors/CompassReading 5.0",
-            "QtSensors/CompassReading 5.1"
+            "QtSensors/CompassReading 5.1",
+            "QtSensors/CompassReading 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "azimuth"; type: "double"; isReadonly: true }
         Property { name: "calibrationLevel"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QmlGyroscope"
         prototype: "QmlSensor"
-        exports: ["QtSensors/Gyroscope 5.0", "QtSensors/Gyroscope 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/Gyroscope 5.0",
+            "QtSensors/Gyroscope 5.1",
+            "QtSensors/Gyroscope 5.2"
+        ]
+        exportMetaObjectRevisions: [0, 0, 0]
     }
     Component {
         name: "QmlGyroscopeReading"
         prototype: "QmlSensorReading"
         exports: [
             "QtSensors/GyroscopeReading 5.0",
-            "QtSensors/GyroscopeReading 5.1"
+            "QtSensors/GyroscopeReading 5.1",
+            "QtSensors/GyroscopeReading 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "x"; type: "double"; isReadonly: true }
         Property { name: "y"; type: "double"; isReadonly: true }
         Property { name: "z"; type: "double"; isReadonly: true }
@@ -124,40 +158,54 @@ Module {
     Component {
         name: "QmlHolsterReading"
         prototype: "QmlSensorReading"
-        exports: ["QtSensors/HolsterReading 5.1"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtSensors/HolsterReading 5.1",
+            "QtSensors/HolsterReading 5.2"
+        ]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "holstered"; type: "bool"; isReadonly: true }
     }
     Component {
         name: "QmlHolsterSensor"
         prototype: "QmlSensor"
-        exports: ["QtSensors/HolsterSensor 5.1"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtSensors/HolsterSensor 5.1",
+            "QtSensors/HolsterSensor 5.2"
+        ]
+        exportMetaObjectRevisions: [0, 0]
     }
     Component {
         name: "QmlIRProximitySensor"
         prototype: "QmlSensor"
         exports: [
             "QtSensors/IRProximitySensor 5.0",
-            "QtSensors/IRProximitySensor 5.1"
+            "QtSensors/IRProximitySensor 5.1",
+            "QtSensors/IRProximitySensor 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        exportMetaObjectRevisions: [0, 0, 0]
     }
     Component {
         name: "QmlIRProximitySensorReading"
         prototype: "QmlSensorReading"
         exports: [
             "QtSensors/IRProximityReading 5.0",
-            "QtSensors/IRProximityReading 5.1"
+            "QtSensors/IRProximityReading 5.1",
+            "QtSensors/IRProximityReading 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "reflectance"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QmlLightSensor"
         prototype: "QmlSensor"
-        exports: ["QtSensors/LightSensor 5.0", "QtSensors/LightSensor 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/LightSensor 5.0",
+            "QtSensors/LightSensor 5.1",
+            "QtSensors/LightSensor 5.2"
+        ]
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "fieldOfView"; type: "double"; isReadonly: true }
         Signal {
             name: "fieldOfViewChanged"
@@ -167,15 +215,24 @@ Module {
     Component {
         name: "QmlLightSensorReading"
         prototype: "QmlSensorReading"
-        exports: ["QtSensors/LightReading 5.0", "QtSensors/LightReading 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/LightReading 5.0",
+            "QtSensors/LightReading 5.1",
+            "QtSensors/LightReading 5.2"
+        ]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "illuminance"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QmlMagnetometer"
         prototype: "QmlSensor"
-        exports: ["QtSensors/Magnetometer 5.0", "QtSensors/Magnetometer 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/Magnetometer 5.0",
+            "QtSensors/Magnetometer 5.1",
+            "QtSensors/Magnetometer 5.2"
+        ]
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "returnGeoValues"; type: "bool" }
         Signal {
             name: "returnGeoValuesChanged"
@@ -187,9 +244,11 @@ Module {
         prototype: "QmlSensorReading"
         exports: [
             "QtSensors/MagnetometerReading 5.0",
-            "QtSensors/MagnetometerReading 5.1"
+            "QtSensors/MagnetometerReading 5.1",
+            "QtSensors/MagnetometerReading 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "x"; type: "double"; isReadonly: true }
         Property { name: "y"; type: "double"; isReadonly: true }
         Property { name: "z"; type: "double"; isReadonly: true }
@@ -200,50 +259,65 @@ Module {
         prototype: "QmlSensor"
         exports: [
             "QtSensors/OrientationSensor 5.0",
-            "QtSensors/OrientationSensor 5.1"
+            "QtSensors/OrientationSensor 5.1",
+            "QtSensors/OrientationSensor 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        exportMetaObjectRevisions: [0, 0, 0]
     }
     Component {
         name: "QmlOrientationSensorReading"
         prototype: "QmlSensorReading"
         exports: [
             "QtSensors/OrientationReading 5.0",
-            "QtSensors/OrientationReading 5.1"
+            "QtSensors/OrientationReading 5.1",
+            "QtSensors/OrientationReading 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "orientation"; type: "QOrientationReading::Orientation"; isReadonly: true }
     }
     Component {
         name: "QmlPressureReading"
         prototype: "QmlSensorReading"
-        exports: ["QtSensors/PressureReading 5.1"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtSensors/PressureReading 5.1",
+            "QtSensors/PressureReading 5.2"
+        ]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 1]
         Property { name: "pressure"; type: "double"; isReadonly: true }
+        Property { name: "temperature"; revision: 1; type: "double"; isReadonly: true }
+        Signal { name: "temperatureChanged"; revision: 1 }
     }
     Component {
         name: "QmlPressureSensor"
         prototype: "QmlSensor"
-        exports: ["QtSensors/PressureSensor 5.1"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtSensors/PressureSensor 5.1",
+            "QtSensors/PressureSensor 5.2"
+        ]
+        exportMetaObjectRevisions: [0, 0]
     }
     Component {
         name: "QmlProximitySensor"
         prototype: "QmlSensor"
         exports: [
             "QtSensors/ProximitySensor 5.0",
-            "QtSensors/ProximitySensor 5.1"
+            "QtSensors/ProximitySensor 5.1",
+            "QtSensors/ProximitySensor 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        exportMetaObjectRevisions: [0, 0, 0]
     }
     Component {
         name: "QmlProximitySensorReading"
         prototype: "QmlSensorReading"
         exports: [
             "QtSensors/ProximityReading 5.0",
-            "QtSensors/ProximityReading 5.1"
+            "QtSensors/ProximityReading 5.1",
+            "QtSensors/ProximityReading 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "near"; type: "bool"; isReadonly: true }
     }
     Component {
@@ -251,9 +325,10 @@ Module {
         prototype: "QmlSensor"
         exports: [
             "QtSensors/RotationSensor 5.0",
-            "QtSensors/RotationSensor 5.1"
+            "QtSensors/RotationSensor 5.1",
+            "QtSensors/RotationSensor 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "hasZ"; type: "bool"; isReadonly: true }
         Signal {
             name: "hasZChanged"
@@ -265,9 +340,11 @@ Module {
         prototype: "QmlSensorReading"
         exports: [
             "QtSensors/RotationReading 5.0",
-            "QtSensors/RotationReading 5.1"
+            "QtSensors/RotationReading 5.1",
+            "QtSensors/RotationReading 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "x"; type: "double"; isReadonly: true }
         Property { name: "y"; type: "double"; isReadonly: true }
         Property { name: "z"; type: "double"; isReadonly: true }
@@ -275,8 +352,13 @@ Module {
     Component {
         name: "QmlSensor"
         prototype: "QObject"
-        exports: ["QtSensors/Sensor 5.0", "QtSensors/Sensor 5.1"]
-        exportMetaObjectRevisions: [0, 1]
+        exports: [
+            "QtSensors/Sensor 5.0",
+            "QtSensors/Sensor 5.1",
+            "QtSensors/Sensor 5.2"
+        ]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 1, 1]
         Enum {
             name: "AxesOrientationMode"
             values: {
@@ -348,9 +430,10 @@ Module {
         prototype: "QObject"
         exports: [
             "QtSensors/SensorGesture 5.0",
-            "QtSensors/SensorGesture 5.1"
+            "QtSensors/SensorGesture 5.1",
+            "QtSensors/SensorGesture 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "availableGestures"; type: "QStringList"; isReadonly: true }
         Property { name: "gestures"; type: "QStringList" }
         Property { name: "validGestures"; type: "QStringList"; isReadonly: true }
@@ -364,8 +447,14 @@ Module {
     Component {
         name: "QmlSensorGlobal"
         prototype: "QObject"
-        exports: ["QtSensors/QmlSensors 5.0", "QtSensors/QmlSensors 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/QmlSensors 5.0",
+            "QtSensors/QmlSensors 5.1",
+            "QtSensors/QmlSensors 5.2"
+        ]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0, 0, 0]
         Signal { name: "availableSensorsChanged" }
         Method { name: "sensorTypes"; type: "QStringList" }
         Method {
@@ -382,8 +471,13 @@ Module {
     Component {
         name: "QmlSensorOutputRange"
         prototype: "QObject"
-        exports: ["QtSensors/OutputRange 5.0", "QtSensors/OutputRange 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/OutputRange 5.0",
+            "QtSensors/OutputRange 5.1",
+            "QtSensors/OutputRange 5.2"
+        ]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "minimum"; type: "double"; isReadonly: true }
         Property { name: "maximum"; type: "double"; isReadonly: true }
         Property { name: "accuracy"; type: "double"; isReadonly: true }
@@ -391,8 +485,13 @@ Module {
     Component {
         name: "QmlSensorRange"
         prototype: "QObject"
-        exports: ["QtSensors/Range 5.0", "QtSensors/Range 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/Range 5.0",
+            "QtSensors/Range 5.1",
+            "QtSensors/Range 5.2"
+        ]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "minimum"; type: "int"; isReadonly: true }
         Property { name: "maximum"; type: "int"; isReadonly: true }
     }
@@ -401,16 +500,22 @@ Module {
         prototype: "QObject"
         exports: [
             "QtSensors/SensorReading 5.0",
-            "QtSensors/SensorReading 5.1"
+            "QtSensors/SensorReading 5.1",
+            "QtSensors/SensorReading 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "timestamp"; type: "qulonglong"; isReadonly: true }
     }
     Component {
         name: "QmlTapSensor"
         prototype: "QmlSensor"
-        exports: ["QtSensors/TapSensor 5.0", "QtSensors/TapSensor 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/TapSensor 5.0",
+            "QtSensors/TapSensor 5.1",
+            "QtSensors/TapSensor 5.2"
+        ]
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "returnDoubleTapEvents"; type: "bool" }
         Signal {
             name: "returnDoubleTapEventsChanged"
@@ -420,8 +525,13 @@ Module {
     Component {
         name: "QmlTapSensorReading"
         prototype: "QmlSensorReading"
-        exports: ["QtSensors/TapReading 5.0", "QtSensors/TapReading 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/TapReading 5.0",
+            "QtSensors/TapReading 5.1",
+            "QtSensors/TapReading 5.2"
+        ]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "tapDirection"; type: "QTapReading::TapDirection"; isReadonly: true }
         Property { name: "doubleTap"; type: "bool"; isReadonly: true }
         Signal { name: "isDoubleTapChanged" }
@@ -429,15 +539,24 @@ Module {
     Component {
         name: "QmlTiltSensor"
         prototype: "QmlSensor"
-        exports: ["QtSensors/TiltSensor 5.0", "QtSensors/TiltSensor 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/TiltSensor 5.0",
+            "QtSensors/TiltSensor 5.1",
+            "QtSensors/TiltSensor 5.2"
+        ]
+        exportMetaObjectRevisions: [0, 0, 0]
         Method { name: "calibrate" }
     }
     Component {
         name: "QmlTiltSensorReading"
         prototype: "QmlSensorReading"
-        exports: ["QtSensors/TiltReading 5.0", "QtSensors/TiltReading 5.1"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: [
+            "QtSensors/TiltReading 5.0",
+            "QtSensors/TiltReading 5.1",
+            "QtSensors/TiltReading 5.2"
+        ]
+        isCreatable: false
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "yRotation"; type: "double"; isReadonly: true }
         Property { name: "xRotation"; type: "double"; isReadonly: true }
     }
diff --git a/src/imports/sensors/qmlsensorgesture.cpp b/src/imports/sensors/qmlsensorgesture.cpp
index 29e220d2..3771f6fb 100644
--- a/src/imports/sensors/qmlsensorgesture.cpp
+++ b/src/imports/sensors/qmlsensorgesture.cpp
@@ -217,7 +217,7 @@ void QmlSensorGesture::setEnabled(bool value)
 */
 
 /*
-  private funtion implementation
+  private function implementation
 */
 void QmlSensorGesture::deleteGesture()
 {
@@ -256,7 +256,7 @@ void QmlSensorGesture::createGesture()
 }
 
 /*
-  End of private funtion implementation
+  End of private function implementation
 */
 
 QT_END_NAMESPACE
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index abcb3812..8e52590a 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -133,7 +133,6 @@ public:
         qmlRegisterType           <QmlSensorGesture            >(package, major, minor, "SensorGesture");
 
         // Register the 5.1 interfaces
-        major = 5;
         minor = 1;
         qmlRegisterSingletonType  <QmlSensorGlobal             >(package, major, minor, "QmlSensors", global_object_50);
         qmlRegisterUncreatableType<QmlSensorRange              >(package, major, minor, "Range",                QLatin1String("Cannot create Range"));
@@ -176,7 +175,6 @@ public:
         qmlRegisterType           <QmlSensorGesture            >(package, major, minor, "SensorGesture");
 
         // Register the 5.2 interfaces
-        major = 5;
         minor = 2;
         qmlRegisterSingletonType  <QmlSensorGlobal             >(package, major, minor, "QmlSensors", global_object_50);
         qmlRegisterUncreatableType<QmlSensorRange              >(package, major, minor, "Range",                QLatin1String("Cannot create Range"));
@@ -217,6 +215,11 @@ public:
         qmlRegisterUncreatableType<QmlTiltSensorReading        >(package, major, minor, "TiltReading",          QLatin1String("Cannot create TiltReading"));
 
         qmlRegisterType           <QmlSensorGesture            >(package, major, minor, "SensorGesture");
+
+        // Register the 5.3 interfaces
+        // No API changes, just reintroduce existing interfaces for 5.3
+        minor = 3;
+        qmlRegisterType           <QmlAltimeter                >(package, major, minor, "Altimeter");
     }
 };
 
diff --git a/src/plugins/sensors/blackberry/bbguihelper.cpp b/src/plugins/sensors/blackberry/bbguihelper.cpp
index a0b2a38f..8b8e84fa 100644
--- a/src/plugins/sensors/blackberry/bbguihelper.cpp
+++ b/src/plugins/sensors/blackberry/bbguihelper.cpp
@@ -132,7 +132,7 @@ void BbGuiHelper::readApplicationActiveState()
 void BbGuiHelper::readOrientation()
 {
     // There is no API to get the current orientation at the moment.
-    // Therefore, we assume that the inital orientation that is set in the environment variable
+    // Therefore, we assume that the initial orientation that is set in the environment variable
     // hasn't changed yet.
     // This assumptions don't always hold, but it is the best we got so far.
     // The navigator will at least inform us about updates.
diff --git a/src/plugins/sensors/blackberry/bbproximitysensor.cpp b/src/plugins/sensors/blackberry/bbproximitysensor.cpp
index 1177f744..2c08df41 100644
--- a/src/plugins/sensors/blackberry/bbproximitysensor.cpp
+++ b/src/plugins/sensors/blackberry/bbproximitysensor.cpp
@@ -54,6 +54,10 @@ QString BbProximitySensor::devicePath()
 bool BbProximitySensor::updateReadingFromEvent(const sensor_event_t &event, QProximityReading *reading)
 {
     const qreal minProximity = sensor()->outputRanges().first().minimum;
-    reading->setClose(event.proximity_s.distance <= minProximity);
+    const qreal maxProximity = sensor()->outputRanges().first().maximum;
+    // An object within 8.0 cm of the sensor is regarded as close. This is the same threshold used
+    // for face-detect during phone calls on BB10.
+    const qreal threshold = (maxProximity > 1.0) ? 8.0 : minProximity;
+    reading->setClose(event.proximity_s.distance <= threshold);
     return true;
 }
diff --git a/src/plugins/sensors/blackberry/bbsensorbackend.h b/src/plugins/sensors/blackberry/bbsensorbackend.h
index 953d7bcf..bd206e38 100644
--- a/src/plugins/sensors/blackberry/bbsensorbackend.h
+++ b/src/plugins/sensors/blackberry/bbsensorbackend.h
@@ -80,8 +80,8 @@ protected:
 
     void setDevice(const QString &deviceFile, sensor_type_e sensorType);
 
-    // This is called while the device file is open during initalization and gives a subclass
-    // an opportunity to do additional initalization.
+    // This is called while the device file is open during initialization and gives a subclass
+    // an opportunity to do additional initialization.
     virtual void additionalDeviceInit();
 
     // If true is returned here, initSensorInfo() will read the output range from the OS sensor
diff --git a/src/plugins/sensors/blackberry/sensor.h b/src/plugins/sensors/blackberry/sensor.h
index 7317f076..2e97497f 100644
--- a/src/plugins/sensors/blackberry/sensor.h
+++ b/src/plugins/sensors/blackberry/sensor.h
@@ -41,7 +41,7 @@
 
 //
 // This file is a copy of the "sensor.h" header for the BlackBerry Playbook OS.
-// It is only inclulded here, because it is not available in the the Playbook NDK.
+// It is only inclulded here, because it is not available in the Playbook NDK.
 //
 #if !defined(Q_OS_BLACKBERRY_TABLET)
 #error "This file is supposed to be used only for BlackBerry Playbook OS."
diff --git a/src/plugins/sensors/generic/generictiltsensor.cpp b/src/plugins/sensors/generic/generictiltsensor.cpp
index 95c8525b..ea85032e 100644
--- a/src/plugins/sensors/generic/generictiltsensor.cpp
+++ b/src/plugins/sensors/generic/generictiltsensor.cpp
@@ -139,7 +139,7 @@ bool GenericTiltSensor::filter(QAccelerometerReading *reading)
 #endif
     qreal xrot = roll - calibratedRoll;
     qreal yrot = pitch - calibratedPitch;
-    //get angle beteen 0 and 180 or 0 -180
+    //get angle between 0 and 180 or 0 -180
     qreal aG = 1 * sin(xrot);
     qreal aK = 1 * cos(xrot);
     xrot = qAtan2(aG, aK);
diff --git a/src/sensors/doc/src/qtsensorgestures-plugins.qdoc b/src/sensors/doc/src/qtsensorgestures-plugins.qdoc
index ffea1776..a86335bd 100644
--- a/src/sensors/doc/src/qtsensorgestures-plugins.qdoc
+++ b/src/sensors/doc/src/qtsensorgestures-plugins.qdoc
@@ -71,7 +71,7 @@ classes to subclass.
 \section3 Recognizer Plugins
 
 The Sensor Gesture Recognizers that come with Qt are made using an ad-hoc heuristic approach.
-The user cannot define their own gestures, and must learn how to perform and accomodate the
+The user cannot define their own gestures, and must learn how to perform and accommodate the
 pre-defined gestures herein.
 
 A developer may use any method, including computationally- and training-intensive well-