Rename QtMobility.sensors 1.3 to QtSensors 5.0

Change-Id: I2b24533d38db1f8e205de19b67fe0b21625bbf6b
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>

18 files changed, 144 insertions, 191 deletions

diff --git a/src/imports/sensors/qmlaccelerometer.cpp b/src/imports/sensors/qmlaccelerometer.cpp
index 8b6caacb..3771dc3f 100644
--- a/src/imports/sensors/qmlaccelerometer.cpp
+++ b/src/imports/sensors/qmlaccelerometer.cpp
@@ -46,9 +46,9 @@
     \qmltype Accelerometer
     \instantiates QmlAccelerometer
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The Accelerometer element reports on linear acceleration
            along the X, Y and Z axes.
 
@@ -85,9 +85,9 @@ QSensor *QmlAccelerometer::sensor() const
     \qmltype AccelerometerReading
     \instantiates QmlAccelerometerReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The AccelerometerReading element holds the most recent Accelerometer reading.
 
     The AccelerometerReading element holds the most recent Accelerometer reading.
@@ -109,7 +109,7 @@ QmlAccelerometerReading::~QmlAccelerometerReading()
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::AccelerometerReading::x
+    \qmlproperty qreal QtSensors::AccelerometerReading::x
     This property holds the acceleration on the X axis.
 
     Please see QAccelerometerReading::x for information about this property.
@@ -121,7 +121,7 @@ qreal QmlAccelerometerReading::x() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::AccelerometerReading::y
+    \qmlproperty qreal QtSensors::AccelerometerReading::y
     This property holds the acceleration on the Y axis.
 
     Please see QAccelerometerReading::y for information about this property.
@@ -133,7 +133,7 @@ qreal QmlAccelerometerReading::y() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::AccelerometerReading::z
+    \qmlproperty qreal QtSensors::AccelerometerReading::z
     This property holds the acceleration on the Z axis.
 
     Please see QAccelerometerReading::z for information about this property.
diff --git a/src/imports/sensors/qmlambientlightsensor.cpp b/src/imports/sensors/qmlambientlightsensor.cpp
index 784c8b1e..9cd9b356 100644
--- a/src/imports/sensors/qmlambientlightsensor.cpp
+++ b/src/imports/sensors/qmlambientlightsensor.cpp
@@ -46,9 +46,9 @@
     \qmltype AmbientLightSensor
     \instantiates QmlAmbientLightSensor
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The AmbientLightSensor element repors on ambient lighting conditions.
 
     The AmbientLightSensor element repors on ambient lighting conditions.
@@ -83,9 +83,9 @@ QSensor *QmlAmbientLightSensor::sensor() const
     \qmltype AmbientLightReading
     \instantiates QmlAmbientLightSensorReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The AmbientLightReading element holds the most AmbientLightSensor reading.
 
     The AmbientLightReading element holds the most AmbientLightSensor reading.
@@ -107,7 +107,7 @@ QmlAmbientLightSensorReading::~QmlAmbientLightSensorReading()
 }
 
 /*!
-    \qmlproperty LightLevel QtMobility.sensors1::AmbientLightReading::lightLevel
+    \qmlproperty LightLevel QtSensors::AmbientLightReading::lightLevel
     This property holds the ambient light level.
 
     Please see QAmbientLightReading::lightLevel for information about this property.
diff --git a/src/imports/sensors/qmlcompass.cpp b/src/imports/sensors/qmlcompass.cpp
index 886e7c74..959cd36b 100644
--- a/src/imports/sensors/qmlcompass.cpp
+++ b/src/imports/sensors/qmlcompass.cpp
@@ -46,9 +46,9 @@
     \qmltype Compass
     \instantiates QmlCompass
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The Compass element reports on heading using magnetic north as a reference.
 
     The Compass element reports on heading using magnetic north as a reference.
@@ -83,9 +83,9 @@ QSensor *QmlCompass::sensor() const
     \qmltype CompassReading
     \instantiates QmlCompassReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The CompassReading element holds the most recent Compass reading.
 
     The CompassReading element holds the most recent Compass reading.
@@ -107,7 +107,7 @@ QmlCompassReading::~QmlCompassReading()
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::CompassReading::azimuth
+    \qmlproperty qreal QtSensors::CompassReading::azimuth
     This property holds the azimuth of the device.
 
     Please see QCompassReading::azimuth for information about this property.
@@ -119,7 +119,7 @@ qreal QmlCompassReading::azimuth() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::CompassReading::calibrationLevel
+    \qmlproperty qreal QtSensors::CompassReading::calibrationLevel
     This property holds the calibration level of the reading.
 
     Please see QCompassReading::calibrationLevel for information about this property.
diff --git a/src/imports/sensors/qmldir b/src/imports/sensors/qmldir
index a84a2d32..d4648a87 100644
--- a/src/imports/sensors/qmldir
+++ b/src/imports/sensors/qmldir
@@ -1,3 +1,3 @@
-module QtMobility.sensors
+module QtSensors
 plugin declarative_sensors
 typeinfo plugins.qmltypes
diff --git a/src/imports/sensors/qmlgyroscope.cpp b/src/imports/sensors/qmlgyroscope.cpp
index b52badb3..a60a7eb8 100644
--- a/src/imports/sensors/qmlgyroscope.cpp
+++ b/src/imports/sensors/qmlgyroscope.cpp
@@ -46,9 +46,9 @@
     \qmltype Gyroscope
     \instantiates QmlGyroscope
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.2
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The Gyroscope element reports on rotational acceleration
            around the X, Y and Z axes.
 
@@ -82,9 +82,9 @@ QSensor *QmlGyroscope::sensor() const
     \qmltype GyroscopeReading
     \instantiates QmlGyroscopeReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.2
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The GyroscopeReading element holds the most recent Gyroscope reading.
 
     The GyroscopeReading element holds the most recent Gyroscope reading.
@@ -106,7 +106,7 @@ QmlGyroscopeReading::~QmlGyroscopeReading()
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::GyroscopeReading::x
+    \qmlproperty qreal QtSensors::GyroscopeReading::x
     This property holds the angular velocity around the x axis.
 
     Please see QGyroscopeReading::x for information about this property.
@@ -118,7 +118,7 @@ qreal QmlGyroscopeReading::x() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::GyroscopeReading::y
+    \qmlproperty qreal QtSensors::GyroscopeReading::y
     This property holds the angular velocity around the y axis.
 
     Please see QGyroscopeReading::y for information about this property.
@@ -130,7 +130,7 @@ qreal QmlGyroscopeReading::y() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::GyroscopeReading::z
+    \qmlproperty qreal QtSensors::GyroscopeReading::z
     This property holds the angular velocity around the z axis.
 
     Please see QGyroscopeReading::z for information about this property.
diff --git a/src/imports/sensors/qmlirproximitysensor.cpp b/src/imports/sensors/qmlirproximitysensor.cpp
index 6c86872e..00dbabb7 100644
--- a/src/imports/sensors/qmlirproximitysensor.cpp
+++ b/src/imports/sensors/qmlirproximitysensor.cpp
@@ -46,9 +46,9 @@
     \qmltype IRProximitySensor
     \instantiates QmlIRProximitySensor
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.3
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The IRProximitySensor element reports on infra-red reflectance values.
 
     This element wraps the QIRProximitySensor class. Please see the documentation for
@@ -81,9 +81,9 @@ QSensor *QmlIRProximitySensor::sensor() const
     \qmltype IRProximityReading
     \instantiates QmlIRProximitySensorReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.3
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The IRProximityReading element holds the most recent IR proximity reading.
 
     The IRProximityReading element holds the most recent IR proximity reading.
@@ -105,7 +105,7 @@ QmlIRProximitySensorReading::~QmlIRProximitySensorReading()
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::IRProximityReading::reflectance
+    \qmlproperty qreal QtSensors::IRProximityReading::reflectance
     This property holds the reflectance value.
 
     Please see QIRProximityReading::reflectance for information about this property.
diff --git a/src/imports/sensors/qmllightsensor.cpp b/src/imports/sensors/qmllightsensor.cpp
index 6992ea58..b1995772 100644
--- a/src/imports/sensors/qmllightsensor.cpp
+++ b/src/imports/sensors/qmllightsensor.cpp
@@ -46,9 +46,9 @@
     \qmltype LightSensor
     \instantiates QmlLightSensor
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.2
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The LightSensor element reports on light levels using LUX.
 
     The LightSensor element reports on light levels using LUX.
@@ -80,7 +80,7 @@ QSensor *QmlLightSensor::sensor() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::LightSensor::fieldOfView
+    \qmlproperty qreal QtSensors::LightSensor::fieldOfView
     This property holds a value indicating the field of view.
 
     Please see QLightSensor::fieldOfView for information about this property.
@@ -101,9 +101,9 @@ void QmlLightSensor::_update()
     \qmltype LightReading
     \instantiates QmlLightSensorReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.2
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The LightReading element holds the most recent LightSensor reading.
 
     The LightReading element holds the most recent LightSensor reading.
diff --git a/src/imports/sensors/qmlmagnetometer.cpp b/src/imports/sensors/qmlmagnetometer.cpp
index c266e6ac..f2eef9a9 100644
--- a/src/imports/sensors/qmlmagnetometer.cpp
+++ b/src/imports/sensors/qmlmagnetometer.cpp
@@ -46,9 +46,9 @@
     \qmltype Magnetometer
     \instantiates QmlMagnetometer
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The Magnetometer element reports on magnetic field strength
            along the Z, Y and Z axes.
 
@@ -82,7 +82,7 @@ QSensor *QmlMagnetometer::sensor() const
 }
 
 /*!
-    \qmlproperty bool QtMobility.sensors1::Magnetometer::returnGeoValues
+    \qmlproperty bool QtSensors::Magnetometer::returnGeoValues
     This property holds a value indicating if geomagnetic values should be returned.
 
     Please see QMagnetometer::returnGeoValues for information about this property.
@@ -103,9 +103,9 @@ void QmlMagnetometer::setReturnGeoValues(bool geo)
     \qmltype MagnetometerReading
     \instantiates QmlMagnetometerReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The MagnetometerReading element holds the most recent Magnetometer reading.
 
     The MagnetometerReading element holds the most recent Magnetometer reading.
@@ -127,7 +127,7 @@ QmlMagnetometerReading::~QmlMagnetometerReading()
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::MagnetometerReading::x
+    \qmlproperty qreal QtSensors::MagnetometerReading::x
     This property holds the raw magnetic flux density on the X axis.
 
     Please see QMagnetometerReading::x for information about this property.
@@ -139,7 +139,7 @@ qreal QmlMagnetometerReading::x() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::MagnetometerReading::y
+    \qmlproperty qreal QtSensors::MagnetometerReading::y
     This property holds the raw magnetic flux density on the Y axis.
 
     Please see QMagnetometerReading::y for information about this property.
@@ -151,7 +151,7 @@ qreal QmlMagnetometerReading::y() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::MagnetometerReading::z
+    \qmlproperty qreal QtSensors::MagnetometerReading::z
     This property holds the raw magnetic flux density on the Z axis.
 
     Please see QMagnetometerReading::z for information about this property.
@@ -163,7 +163,7 @@ qreal QmlMagnetometerReading::z() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::MagnetometerReading::calibrationLevel
+    \qmlproperty qreal QtSensors::MagnetometerReading::calibrationLevel
     This property holds the accuracy of the reading.
 
     Please see QMagnetometerReading::calibrationLevel for information about this property.
diff --git a/src/imports/sensors/qmlorientationsensor.cpp b/src/imports/sensors/qmlorientationsensor.cpp
index 9db69c19..a51dd87c 100644
--- a/src/imports/sensors/qmlorientationsensor.cpp
+++ b/src/imports/sensors/qmlorientationsensor.cpp
@@ -46,9 +46,9 @@
     \qmltype OrientationSensor
     \instantiates QmlOrientationSensor
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The OrientationSensor element reports device orientation.
 
     The OrientationSensor element reports device orientation.
@@ -83,9 +83,9 @@ QSensor *QmlOrientationSensor::sensor() const
     \qmltype OrientationReading
     \instantiates QmlOrientationSensorReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The OrientationReading element holds the most recent OrientationSensor reading.
 
     The OrientationReading element holds the most recent OrientationSensor reading.
@@ -107,7 +107,7 @@ QmlOrientationSensorReading::~QmlOrientationSensorReading()
 }
 
 /*!
-    \qmlproperty Orientation QtMobility.sensors1::OrientationReading::orientation
+    \qmlproperty Orientation QtSensors::OrientationReading::orientation
     This property holds the orientation of the device.
 
     Please see QOrientationReading::orientation for information about this property.
diff --git a/src/imports/sensors/qmlproximitysensor.cpp b/src/imports/sensors/qmlproximitysensor.cpp
index fa06f80a..e6ffc644 100644
--- a/src/imports/sensors/qmlproximitysensor.cpp
+++ b/src/imports/sensors/qmlproximitysensor.cpp
@@ -46,9 +46,9 @@
     \qmltype ProximitySensor
     \instantiates QmlProximitySensor
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The ProximitySensor element reports on object proximity.
 
     The ProximitySensor element reports on object proximity.
@@ -83,9 +83,9 @@ QSensor *QmlProximitySensor::sensor() const
     \qmltype ProximityReading
     \instantiates QmlProximitySensorReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The ProximityReading element holds the most recent ProximitySensor reading.
 
     The ProximityReading element holds the most recent ProximitySensor reading.
diff --git a/src/imports/sensors/qmlrotationsensor.cpp b/src/imports/sensors/qmlrotationsensor.cpp
index 745af81c..cb7d47a6 100644
--- a/src/imports/sensors/qmlrotationsensor.cpp
+++ b/src/imports/sensors/qmlrotationsensor.cpp
@@ -46,9 +46,9 @@
     \qmltype RotationSensor
     \instantiates QmlRotationSensor
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The RotationSensor element reports on device rotation
            around the X, Y and Z axes.
 
@@ -82,7 +82,7 @@ QSensor *QmlRotationSensor::sensor() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::RotationSensor::hasZ
+    \qmlproperty qreal QtSensors::RotationSensor::hasZ
     This property holds a value indicating if the z angle is available.
 
     Please see QRotationSensor::hasZ for information about this property.
@@ -101,9 +101,9 @@ void QmlRotationSensor::_update()
     \qmltype RotationReading
     \instantiates QmlRotationSensorReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The RotationReading element holds the most recent RotationSensor reading.
 
     The RotationReading element holds the most recent RotationSensor reading.
@@ -125,7 +125,7 @@ QmlRotationSensorReading::~QmlRotationSensorReading()
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::RotationReading::x
+    \qmlproperty qreal QtSensors::RotationReading::x
     This property holds the rotation around the x axis.
 
     Please see QRotationReading::x for information about this property.
@@ -137,7 +137,7 @@ qreal QmlRotationSensorReading::x() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::RotationReading::y
+    \qmlproperty qreal QtSensors::RotationReading::y
     This property holds the rotation around the y axis.
 
     Please see QRotationReading::y for information about this property.
@@ -149,7 +149,7 @@ qreal QmlRotationSensorReading::y() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::RotationReading::z
+    \qmlproperty qreal QtSensors::RotationReading::z
     This property holds the rotation around the z axis.
 
     Please see QRotationReading::z for information about this property.
diff --git a/src/imports/sensors/qmlsensor.cpp b/src/imports/sensors/qmlsensor.cpp
index 217b5dc2..e12171ae 100644
--- a/src/imports/sensors/qmlsensor.cpp
+++ b/src/imports/sensors/qmlsensor.cpp
@@ -48,8 +48,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Sensor
     \instantiates QmlSensor
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
     \brief The Sensor element serves as a base type for sensors.
 
     The Sensor element serves as a base type for sensors.
@@ -92,7 +92,7 @@ void QmlSensor::setIdentifier(const QString &identifier)
 }
 
 /*!
-    \qmlproperty string QtMobility.sensors1::Sensor::type
+    \qmlproperty string QtSensors::Sensor::type
     This property holds the type of the sensor.
 */
 
@@ -102,7 +102,7 @@ QString QmlSensor::type() const
 }
 
 /*!
-    \qmlproperty bool QtMobility.sensors1::Sensor::connectedToBackend
+    \qmlproperty bool QtSensors::Sensor::connectedToBackend
     This property holds a value indicating if the sensor has connected to a backend.
 
     Please see QSensor::connectedToBackend for information about this property.
@@ -114,7 +114,7 @@ bool QmlSensor::isConnectedToBackend() const
 }
 
 /*!
-    \qmlproperty bool QtMobility.sensors1::Sensor::busy
+    \qmlproperty bool QtSensors::Sensor::busy
     This property holds a value to indicate if the sensor is busy.
 
     Please see QSensor::busy for information about this property.
@@ -126,7 +126,7 @@ bool QmlSensor::isBusy() const
 }
 
 /*!
-    \qmlproperty bool QtMobility.sensors1::Sensor::active
+    \qmlproperty bool QtSensors::Sensor::active
     This property holds a value to indicate if the sensor is active.
 
     Please see QSensor::active for information about this property.
@@ -154,7 +154,7 @@ bool QmlSensor::isActive() const
 }
 
 /*!
-    \qmlproperty bool QtMobility.sensors1::Sensor::alwaysOn
+    \qmlproperty bool QtSensors::Sensor::alwaysOn
     This property holds a value to indicate if the sensor should remain running when the screen is off.
 
     Please see QSensor::alwaysOn for information about this property.
@@ -171,7 +171,7 @@ void QmlSensor::setAlwaysOn(bool alwaysOn)
 }
 
 /*!
-    \qmlproperty list<Range> QtMobility.sensors1::Sensor::availableDataRates
+    \qmlproperty list<Range> QtSensors::Sensor::availableDataRates
     This property holds the data rates that the sensor supports.
 
     Please see QSensor::availableDataRates for information about this property.
@@ -192,7 +192,7 @@ QQmlListProperty<QmlSensorRange> QmlSensor::availableDataRates() const
 }
 
 /*!
-    \qmlproperty int QtMobility.sensors1::Sensor::dataRate
+    \qmlproperty int QtSensors::Sensor::dataRate
     This property holds the data rate that the sensor should be run at.
 
     Please see QSensor::dataRate for information about this property.
@@ -212,7 +212,7 @@ void QmlSensor::setDataRate(int rate)
 }
 
 /*!
-    \qmlproperty list<OutputRange> QtMobility.sensors1::Sensor::outputRanges
+    \qmlproperty list<OutputRange> QtSensors::Sensor::outputRanges
     This property holds a list of output ranges the sensor supports.
 
     Please see QSensor::outputRanges for information about this property.
@@ -234,7 +234,7 @@ QQmlListProperty<QmlSensorOutputRange> QmlSensor::outputRanges() const
 }
 
 /*!
-    \qmlproperty int QtMobility.sensors1::Sensor::outputRange
+    \qmlproperty int QtSensors::Sensor::outputRange
     This property holds the output range in use by the sensor.
 
     Please see QSensor::outputRange for information about this property.
@@ -255,7 +255,7 @@ void QmlSensor::setOutputRange(int index)
 }
 
 /*!
-    \qmlproperty string QtMobility.sensors1::Sensor::description
+    \qmlproperty string QtSensors::Sensor::description
     This property holds a descriptive string for the sensor.
 */
 
@@ -265,7 +265,7 @@ QString QmlSensor::description() const
 }
 
 /*!
-    \qmlproperty int QtMobility.sensors1::Sensor::error
+    \qmlproperty int QtSensors::Sensor::error
     This property holds the last error code set on the sensor.
 */
 
@@ -275,7 +275,7 @@ int QmlSensor::error() const
 }
 
 /*!
-    \qmlproperty SensorReading QtMobility.sensors1::Sensor::reading
+    \qmlproperty SensorReading QtSensors::Sensor::reading
     This property holds the reading class.
 
     Please see QSensor::reading for information about this property.
@@ -288,7 +288,7 @@ QmlSensorReading *QmlSensor::reading() const
 }
 
 /*!
-    \qmlmethod bool QtMobility.sensors1::Sensor::start()
+    \qmlmethod bool QtSensors::Sensor::start()
     Start retrieving values from the sensor. Returns true if the sensor was started, false otherwise.
 
     Please see QSensor::start() for information.
@@ -301,7 +301,7 @@ bool QmlSensor::start()
 }
 
 /*!
-    \qmlmethod bool QtMobility.sensors1::Sensor::stop()
+    \qmlmethod bool QtSensors::Sensor::stop()
     Stop retrieving values from the sensor.
 
     Please see QSensor::stop() for information.
@@ -380,8 +380,8 @@ void QmlSensor::updateReading()
 /*!
     \qmltype SensorReading
     \instantiates QmlSensorReading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
     \brief The SensorReading element serves as a base type for sensor readings.
 
     The SensorReading element serves as a base type for sensor readings.
@@ -402,7 +402,7 @@ QmlSensorReading::~QmlSensorReading()
 }
 
 /*!
-    \qmlproperty quint64 QtMobility.sensors1::SensorReading::timestamp
+    \qmlproperty quint64 QtSensors::SensorReading::timestamp
     A timestamp for the reading.
 
     Please see QSensorReading::timestamp for information about this property.
diff --git a/src/imports/sensors/qmlsensorgesture.cpp b/src/imports/sensors/qmlsensorgesture.cpp
index 4f1b8367..2fae55e3 100644
--- a/src/imports/sensors/qmlsensorgesture.cpp
+++ b/src/imports/sensors/qmlsensorgesture.cpp
@@ -48,8 +48,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype SensorGesture
     \instantiates QmlSensorGesture
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.3
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
     \brief Provides notifications when sensor-based gestures are detected.
 
     This type provides notification when sensor gestures are triggered.
@@ -117,7 +117,7 @@ void QmlSensorGesture::componentComplete()
 */
 
 /*!
-    \qmlproperty stringlist QtMobility.sensors1::SensorGesture::availableGestures
+    \qmlproperty stringlist QtSensors::SensorGesture::availableGestures
     This property can be used to determine all available gestures on the system.
 */
 QStringList QmlSensorGesture::availableGestures()
@@ -126,13 +126,13 @@ QStringList QmlSensorGesture::availableGestures()
 }
 
 /*!
-    \qmlproperty stringlist QtMobility.sensors1::SensorGesture::gestures
+    \qmlproperty stringlist QtSensors::SensorGesture::gestures
     Set this property to a list of the gestures that the application is interested in detecting.
     This property cannot be changed while the type is enabled.
 
     The properties validGestures and invalidGestures will be set as appropriate immediately.
     To determine all available getures on the system please use the
-    \l {QtMobility.sensors1::SensorGesture::availableGestures} {availableGestures} property.
+    \l {QtSensors::SensorGesture::availableGestures} {availableGestures} property.
 
     \sa {QtSensorGestures Plugins}
 */
@@ -157,7 +157,7 @@ void QmlSensorGesture::setGestures(const QStringList& value)
 
 
 /*!
-    \qmlproperty stringlist QtMobility.sensors1::SensorGesture::validGestures
+    \qmlproperty stringlist QtSensors::SensorGesture::validGestures
     This property holds the requested gestures that were found on the system.
 */
 QStringList QmlSensorGesture::validGestures() const
@@ -168,7 +168,7 @@ QStringList QmlSensorGesture::validGestures() const
 }
 
 /*!
-    \qmlproperty stringlist QtMobility.sensors1::SensorGesture::invalidGestures
+    \qmlproperty stringlist QtSensors::SensorGesture::invalidGestures
     This property holds the requested gestures that were not found on the system.
 */
 QStringList QmlSensorGesture::invalidGestures() const
@@ -179,10 +179,10 @@ QStringList QmlSensorGesture::invalidGestures() const
 }
 
 /*!
-    \qmlproperty bool QtMobility.sensors1::SensorGesture::enabled
+    \qmlproperty bool QtSensors::SensorGesture::enabled
     This property can be used to activate or deactivate the sensor gesture.
     Default value is false;
-    \sa {QtMobility.sensors1::SensorGesture::detected}, {detected}
+    \sa {QtSensors::SensorGesture::detected}, {detected}
 */
 bool QmlSensorGesture::enabled() const
 {
@@ -211,7 +211,7 @@ void QmlSensorGesture::setEnabled(bool value)
 }
 
 /*!
-    \qmlsignal QtMobility.sensors1::SensorGesture::detected(string gesture)
+    \qmlsignal QtSensors::SensorGesture::detected(string gesture)
     This signal is emitted whenever a gesture is detected.
     The gesture parameter contains the gesture that was detected.
 */
diff --git a/src/imports/sensors/qmlsensorglobal.cpp b/src/imports/sensors/qmlsensorglobal.cpp
index 5c9723af..9f26e419 100644
--- a/src/imports/sensors/qmlsensorglobal.cpp
+++ b/src/imports/sensors/qmlsensorglobal.cpp
@@ -47,8 +47,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype SensorGlobal
     \instantiates QmlSensorGlobal
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.3
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
     \brief The SensorGlobal element provides the module API.
 
     The SensorGlobal element provides the module API.
@@ -56,8 +56,8 @@ QT_BEGIN_NAMESPACE
     This element cannot be directly created. It can only be accessed via a namespace import.
 
     \code
-    import QtMobility.sensors 1.3
-    import QtMobility.sensors 1.3 as Sensors
+    import QtSensors 5.0
+    import QtSensors 5.0 as Sensors
     ...
         Component.onCompleted: {
             var types = Sensors.sensorTypes();
@@ -78,7 +78,7 @@ QmlSensorGlobal::~QmlSensorGlobal()
 }
 
 /*!
-    \qmlmethod list<string> QtMobility.sensors1::SensorGlobal::sensorTypes()
+    \qmlmethod list<string> QtSensors::SensorGlobal::sensorTypes()
     Returns a list of the sensor types that have been registered.
 
     Please see QSensor::sensorTypes() for information.
@@ -92,7 +92,7 @@ QStringList QmlSensorGlobal::sensorTypes() const
 }
 
 /*!
-    \qmlmethod list<string> QtMobility.sensors1::SensorGlobal::sensorsForType(type)
+    \qmlmethod list<string> QtSensors::SensorGlobal::sensorsForType(type)
     Returns a list of the sensor identifiers that have been registered for \a type.
 
     Please see QSensor::sensorsForType() for information.
@@ -106,7 +106,7 @@ QStringList QmlSensorGlobal::sensorsForType(const QString &type) const
 }
 
 /*!
-    \qmlmethod string QtMobility.sensors1::SensorGlobal::defaultSensorForType(type)
+    \qmlmethod string QtSensors::SensorGlobal::defaultSensorForType(type)
     Returns the default sensor identifier that has been registered for \a type.
 
     Please see QSensor::defaultSensorForType() for information.
diff --git a/src/imports/sensors/qmltapsensor.cpp b/src/imports/sensors/qmltapsensor.cpp
index ac17df09..6e00f386 100644
--- a/src/imports/sensors/qmltapsensor.cpp
+++ b/src/imports/sensors/qmltapsensor.cpp
@@ -46,9 +46,9 @@
     \qmltype TapSensor
     \instantiates QmlTapSensor
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The TapSensor element reports tap and double tap events
            along the X, Y and Z axes.
 
@@ -82,7 +82,7 @@ QSensor *QmlTapSensor::sensor() const
 }
 
 /*!
-    \qmlproperty bool QtMobility.sensors1::TapSensor::returnDoubleTapEvents
+    \qmlproperty bool QtSensors::TapSensor::returnDoubleTapEvents
     This property holds a value indicating if double tap events should be reported.
 
     Please see QTapSensor::returnDoubleTapEvents for information about this property.
@@ -104,9 +104,9 @@ void QmlTapSensor::setReturnDoubleTapEvents(bool ret)
     \qmltype TapReading
     \instantiates QmlTapSensorReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The TapReading element holds the most recent TapSensor reading.
 
     The TapReading element holds the most recent TapSensor reading.
@@ -128,7 +128,7 @@ QmlTapSensorReading::~QmlTapSensorReading()
 }
 
 /*!
-    \qmlproperty TapDirection QtMobility.sensors1::TapReading::tapDirection
+    \qmlproperty TapDirection QtSensors::TapReading::tapDirection
     This property holds the direction of the tap.
 
     Please see QTapReading::tapDirection for information about this property.
@@ -150,7 +150,7 @@ QTapReading::TapDirection QmlTapSensorReading::tapDirection() const
 }
 
 /*!
-    \qmlproperty bool QtMobility.sensors1::TapReading::doubleTap
+    \qmlproperty bool QtSensors::TapReading::doubleTap
     This property holds a value indicating if there was a single or double tap.
 
     Please see QTapReading::doubleTap for information about this property.
diff --git a/src/imports/sensors/qmltiltsensor.cpp b/src/imports/sensors/qmltiltsensor.cpp
index 39871044..34a3bc2f 100644
--- a/src/imports/sensors/qmltiltsensor.cpp
+++ b/src/imports/sensors/qmltiltsensor.cpp
@@ -49,9 +49,9 @@ QT_END_NAMESPACE
     \qmltype TiltSensor
     \instantiates QmlTiltSensor
     \ingroup qml-sensors_type
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::Sensor
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::Sensor
     \brief The TiltSensor element reports tilt events
            along the X and Y axes.
 
@@ -84,7 +84,7 @@ QSensor *QmlTiltSensor::sensor() const
 }
 
 /*!
-    \qmlmethod QtMobility.sensors1::TiltSensor::calibrate()
+    \qmlmethod QtSensors::TiltSensor::calibrate()
     Calibrate the tilt sensor.
 
     Please see QTiltSensor::calibrate() for information about this property.
@@ -98,9 +98,9 @@ void QmlTiltSensor::calibrate()
     \qmltype TiltReading
     \instantiates QmlTiltSensorReading
     \ingroup qml-sensors_reading
-    \inqmlmodule QtMobility.sensors 1.3
-    \since QtMobility.sensors 1.1
-    \inherits QtMobility.sensors1::SensorReading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.0
+    \inherits QtSensors::SensorReading
     \brief The TiltReading element holds the most recent TiltSensor reading.
 
     The TiltReading element holds the most recent TiltSensor reading.
@@ -122,7 +122,7 @@ QmlTiltSensorReading::~QmlTiltSensorReading()
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::TiltReading::yRotation
+    \qmlproperty qreal QtSensors::TiltReading::yRotation
     This property holds the amount of tilt on the Y axis.
 
     Please see QTiltReading::yRotation for information about this property.
@@ -134,7 +134,7 @@ qreal QmlTiltSensorReading::yRotation() const
 }
 
 /*!
-    \qmlproperty qreal QtMobility.sensors1::TiltReading::xRotation
+    \qmlproperty qreal QtSensors::TiltReading::xRotation
     This property holds the amount of tilt on the X axis.
 
     Please see QTiltReading::xRotation for information about this property.
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index 9c0c864b..50ccdf93 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -74,7 +74,7 @@
 
 QT_BEGIN_NAMESPACE
 
-static QObject *global_object_13(QQmlEngine *, QJSEngine *)
+static QObject *global_object_50(QQmlEngine *, QJSEngine *)
 {
     return new QmlSensorGlobal;
 }
@@ -86,62 +86,15 @@ class QtSensorsDeclarativeModule : public QQmlExtensionPlugin
 public:
     virtual void registerTypes(const char *uri)
     {
-        char const * const package = "QtMobility.sensors";
+        char const * const package = "QtSensors";
         if (QLatin1String(uri) != QLatin1String(package)) return;
         int major;
         int minor;
 
-        // Register the 1.1 interfaces
-        major = 1;
-        minor = 1;
-        qmlRegisterUncreatableType<QSensorReading       >(package, major, minor, "SensorReading",        QLatin1String("Cannot create SensorReading"));
-        qmlRegisterType           <QAccelerometer       >(package, major, minor, "Accelerometer");
-        qmlRegisterType           <QAccelerometerReading>(package, major, minor, "AccelerometerReading");
-        qmlRegisterType           <QAmbientLightSensor  >(package, major, minor, "AmbientLightSensor");
-        qmlRegisterType           <QAmbientLightReading >(package, major, minor, "AmbientLightReading");
-        qmlRegisterType           <QCompass             >(package, major, minor, "Compass");
-        qmlRegisterType           <QCompassReading      >(package, major, minor, "CompassReading");
-        qmlRegisterType           <QMagnetometer        >(package, major, minor, "Magnetometer");
-        qmlRegisterType           <QMagnetometerReading >(package, major, minor, "MagnetometerReading");
-        qmlRegisterType           <QOrientationSensor   >(package, major, minor, "OrientationSensor");
-        qmlRegisterType           <QOrientationReading  >(package, major, minor, "OrientationReading");
-        qmlRegisterType           <QProximitySensor     >(package, major, minor, "ProximitySensor");
-        qmlRegisterType           <QProximityReading    >(package, major, minor, "ProximityReading");
-        qmlRegisterType           <QRotationSensor      >(package, major, minor, "RotationSensor");
-        qmlRegisterType           <QRotationReading     >(package, major, minor, "RotationReading");
-        qmlRegisterType           <QTapSensor           >(package, major, minor, "TapSensor");
-        qmlRegisterType           <QTapReading          >(package, major, minor, "TapReading");
-
-        // Register the 1.2 interfaces
-        major = 1;
-        minor = 2;
-        qmlRegisterUncreatableType<QSensor              >(package, major, minor, "Sensor",               QLatin1String("Cannot create Sensor"));
-        qmlRegisterUncreatableType<QSensorReading       >(package, major, minor, "SensorReading",        QLatin1String("Cannot create SensorReading"));
-        qmlRegisterType           <QAccelerometer       >(package, major, minor, "Accelerometer");
-        qmlRegisterUncreatableType<QAccelerometerReading>(package, major, minor, "AccelerometerReading", QLatin1String("Cannot create AccelerometerReading"));
-        qmlRegisterType           <QAmbientLightSensor  >(package, major, minor, "AmbientLightSensor");
-        qmlRegisterUncreatableType<QAmbientLightReading >(package, major, minor, "AmbientLightReading",  QLatin1String("Cannot create AmbientLightReading"));
-        qmlRegisterType           <QCompass             >(package, major, minor, "Compass");
-        qmlRegisterUncreatableType<QCompassReading      >(package, major, minor, "CompassReading",       QLatin1String("Cannot create CompassReading"));
-        qmlRegisterType           <QMagnetometer        >(package, major, minor, "Magnetometer");
-        qmlRegisterUncreatableType<QMagnetometerReading >(package, major, minor, "MagnetometerReading",  QLatin1String("Cannot create MagnetometerReading"));
-        qmlRegisterType           <QOrientationSensor   >(package, major, minor, "OrientationSensor");
-        qmlRegisterUncreatableType<QOrientationReading  >(package, major, minor, "OrientationReading",   QLatin1String("Cannot create OrientationReading"));
-        qmlRegisterType           <QProximitySensor     >(package, major, minor, "ProximitySensor");
-        qmlRegisterUncreatableType<QProximityReading    >(package, major, minor, "ProximityReading",     QLatin1String("Cannot create ProximityReading"));
-        qmlRegisterType           <QRotationSensor      >(package, major, minor, "RotationSensor");
-        qmlRegisterUncreatableType<QRotationReading     >(package, major, minor, "RotationReading",      QLatin1String("Cannot create RotationReading"));
-        qmlRegisterType           <QTapSensor           >(package, major, minor, "TapSensor");
-        qmlRegisterUncreatableType<QTapReading          >(package, major, minor, "TapReading",           QLatin1String("Cannot create TapReading"));
-        qmlRegisterType           <QLightSensor         >(package, major, minor, "LightSensor");
-        qmlRegisterUncreatableType<QLightReading        >(package, major, minor, "LightReading",         QLatin1String("Cannot create LightReading"));
-        qmlRegisterType           <QGyroscope           >(package, major, minor, "Gyroscope");
-        qmlRegisterUncreatableType<QGyroscopeReading    >(package, major, minor, "GyroscopeReading",     QLatin1String("Cannot create GyroscopeReading"));
-
-        // Register the 1.3 interfaces
-        major = 1;
-        minor = 3;
-        qmlRegisterSingletonType  <QmlSensorGlobal             >(package, major, minor, "QtSensors", global_object_13);
+        // Register the 5.0 interfaces
+        major = 5;
+        minor = 0;
+        qmlRegisterSingletonType  <QmlSensorGlobal             >(package, major, minor, "QmlSensors", global_object_50);
         qmlRegisterUncreatableType<QmlSensorRange              >(package, major, minor, "Range",                QLatin1String("Cannot create Range"));
         qmlRegisterUncreatableType<QmlSensorOutputRange        >(package, major, minor, "OutputRange",          QLatin1String("Cannot create OutputRange"));
         qmlRegisterUncreatableType<QmlSensor                   >(package, major, minor, "Sensor",               QLatin1String("Cannot create Sensor"));
diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro
index 0d08bf3c..d479922a 100644
--- a/src/imports/sensors/sensors.pro
+++ b/src/imports/sensors/sensors.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = sensors
 TARGET  = declarative_sensors
-TARGETPATH = QtMobility/sensors
-IMPORT_VERSION = 1.3 # Doesn't matter, as long as it's a valid version?!
+TARGETPATH = QtSensors
+IMPORT_VERSION = 5.0 # Doesn't matter, as long as it's a valid version?!
 
 include(qsensorsimport.pri)