Docs: change QML elements to QML types in docs.

Change-Id: I54a9a1972978f1d989d262f137b5890d1feb35e0
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>

21 files changed, 143 insertions, 143 deletions

diff --git a/doc/src/examples/accelbubble.qdoc b/doc/src/examples/accelbubble.qdoc
index 4c97c42d..ea741282 100644
--- a/doc/src/examples/accelbubble.qdoc
+++ b/doc/src/examples/accelbubble.qdoc
@@ -28,17 +28,17 @@
 /*!
     \example QtSensors/QtSensors_accelbubble
     \title Qt Sensors - Accel Bubble
-    \brief The AccelBubble example demonstrates the Legacy Accelerometer QML element.
+    \brief The AccelBubble example demonstrates the Legacy Accelerometer QML type.
     \ingroup qtsensors-examples
 
 \section1 Overview
-    Writing a QML application that uses the Legacy Accelerometer QML sensors element requires the following steps:
+    Writing a QML application that uses the Legacy Accelerometer QML sensors type requires the following steps:
 
     Import the Legacy Sensors Declarative module.
 
 \snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml 0
 
-    Add an Accelerometer QML element.
+    Add an Accelerometer QML type.
 
 \snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml  1
 
diff --git a/doc/src/examples/cubehouse.qdoc b/doc/src/examples/cubehouse.qdoc
index 278dd865..15e52fac 100644
--- a/doc/src/examples/cubehouse.qdoc
+++ b/doc/src/examples/cubehouse.qdoc
@@ -33,13 +33,13 @@
     \image cubehouse.png
 
 \section1 Overview
-    To write a QML application that will use the QML Accelerometer element from the QtMobility.sensors import you need to to the following steps:
+    To write a QML application that will use the QML Accelerometer type from the QtMobility.sensors import you need to to the following steps:
 
     Import the QtMobility.sensors declarative plugin:
 
 \snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 0
 
-    Add the Accelerometer QML elements into your qml file.
+    Add the Accelerometer QML types into your qml file.
 
 \snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 1
 
@@ -48,11 +48,11 @@
 \snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 2
 
     Reading out the Accelerometer data can be done by implementing the 'onReadingChanged' slot and
-    accessing the 'reading' property from the Accelerometer element:
+    accessing the 'reading' property from the Accelerometer type:
 
 \snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 3
 
-    By using a timer the view can be rotated using the pitch and roll properties from the Accelerometer element:
+    By using a timer the view can be rotated using the pitch and roll properties from the Accelerometer type:
 
 \snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 4
 
diff --git a/doc/src/examples/grue.qdoc b/doc/src/examples/grue.qdoc
index 73a67fc1..37a602fe 100644
--- a/doc/src/examples/grue.qdoc
+++ b/doc/src/examples/grue.qdoc
@@ -137,7 +137,7 @@
 /*!
     \example QtSensors/QtSensors_grue/import
     \title Grue Sensor QML Import
-    \brief The Grue sensor QML import exports the GrueSensor class as a QML element.
+    \brief The Grue sensor QML import exports the GrueSensor class as a QML type.
 
     This example creates the \e {Grue 1.0} import.
 
@@ -147,7 +147,7 @@
 /*!
     \example QtSensors/QtSensors_grue
     \title Grue Sensor QML Application
-    \brief The Grue sensor QML application demonstrates use of the GrueSensor QML element.
+    \brief The Grue sensor QML application demonstrates use of the GrueSensor QML type.
 
     This is a pure QML application that can be run from Qt Creator or directly using the
     \c qmlscene binary. You should install the other projects before trying to run
diff --git a/doc/src/examples/maze.qdoc b/doc/src/examples/maze.qdoc
index d9f561e7..edd7e65e 100644
--- a/doc/src/examples/maze.qdoc
+++ b/doc/src/examples/maze.qdoc
@@ -32,16 +32,16 @@
     \image maze.png
 
     \section2 Maze in QML
-    \brief The Maze example demonstrates the TiltSensor QML element.
+    \brief The Maze example demonstrates the TiltSensor QML type.
 
 
-    To write a QML application that will use the TiltSensor QML sensors element you need to do the following steps:
+    To write a QML application that will use the TiltSensor QML sensors type you need to do the following steps:
 
     Import the QtSensors 5.x declarative plugin:
 
     \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 0
 
-    Add the Sensor QML elements into your qml file.
+    Add the Sensor QML types into your qml file.
 
     In this example we use the TiltSensor with values based in degrees and an accuracy of 5 degree:
 
diff --git a/doc/src/examples/qmlqtsensors.qdoc b/doc/src/examples/qmlqtsensors.qdoc
index 4c509392..1dfe3202 100644
--- a/doc/src/examples/qmlqtsensors.qdoc
+++ b/doc/src/examples/qmlqtsensors.qdoc
@@ -32,22 +32,22 @@
     \image qmlqtsensors.png
 
     \section2 Qt Sensors in QML
-    \brief The QML QtSensors example demonstrates the QML sensors elements in the QtSensors 5 import.
+    \brief The QtSensors - QML example demonstrates the QML sensors types in the QtSensors 5 import.
 
 
-    To write a QML application that will use the QML sensors elements in the QtSensors 5 import you need to to the following steps:
+    To write a QML application that will use the QML sensors types in the QtSensors 5 import you need to to the following steps:
 
     Import the QtSensors 5.x declarative plugin:
 
     \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 0
 
-    Add the Sensor QML elements into your qml file.
+    Add the Sensor QML types into your qml file.
 
     In this example we use the TiltSensor:
 
     \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 1
 
-    The Tilt-, AmbientLight- and the Proximity QML element sensor have the 'enabled' property in common.
+    The Tilt-, AmbientLight- and the Proximity QML sensor types have the 'enabled' property in common.
     To start or stop the sensor set this property to true or false.
 
     \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 2
diff --git a/doc/src/examples/qmlsensorgtestures.qdoc b/doc/src/examples/qmlsensorgtestures.qdoc
index 1da467a8..f655d2eb 100644
--- a/doc/src/examples/qmlsensorgtestures.qdoc
+++ b/doc/src/examples/qmlsensorgtestures.qdoc
@@ -27,10 +27,10 @@
 
 /*!
     \example QtSensors/QtSensors_qmlsensorgestures
-    \title Qt Sensors - SensorGesture QML Element example
+    \title Qt Sensors - SensorGesture QML Type example
     \ingroup qtsensors-examples
 
-    \brief This example demonstrates use of the SensorGesture QML element.
+    \brief This example demonstrates use of the SensorGesture QML type.
 
 \section1 Overview
     To write a QML application that will use the gesture plugin you need to to the following steps:
@@ -39,11 +39,11 @@
 
 \snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml 0
 
-   Add the SensorGesture QML element into your qml file.
+   Add the SensorGesture QML type into your qml file.
 
 \snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml 1
 
-   Each SensorGesture QML element contains a property called gestures.
+   Each SensorGesture QML type contains a property called gestures.
 
    In this example an alias 'gestureid' for this property is used.
 
diff --git a/doc/src/examples/sensor_explorer.qdoc b/doc/src/examples/sensor_explorer.qdoc
index 1f8e022c..31eb4748 100644
--- a/doc/src/examples/sensor_explorer.qdoc
+++ b/doc/src/examples/sensor_explorer.qdoc
@@ -51,7 +51,7 @@
     qmlscene main.qml
     \endcode
 
-    To write a QML application that will use the Explorer QML element you need to do the following steps:
+    To write a QML application that will use the Explorer QML type you need to do the following steps:
 
     Import the Explorer 1.0 declarative plugin:
 
@@ -83,7 +83,7 @@
     \title Sensor Explorer QML Import
 
     \section2 Sensor Explorer Declarative Plugin
-    \brief The Sensor Explorer QML import exports the QSensorExplorer, QPropertyInfo and the QSensorItem class as a QML element.
+    \brief The Sensor Explorer QML import exports the QSensorExplorer, QPropertyInfo and the QSensorItem class as a QML type.
 
     This example creates the \e {Explorer 1.0} import.
 
diff --git a/doc/src/examples/shakeit.qdoc b/doc/src/examples/shakeit.qdoc
index fca2a9dd..05bb28bc 100644
--- a/doc/src/examples/shakeit.qdoc
+++ b/doc/src/examples/shakeit.qdoc
@@ -35,17 +35,17 @@
     \brief The sensor gesture example demonstrates the steps for creating a QML application
      that uses sensor gestures and the included shake sensor.
 
-    Writing a QML application that uses the Shake QML sensorgestures element requires the following steps:
+    Writing a QML application that uses the Shake QML sensorgestures type requires the following steps:
 
     Import the Sensors Declarative module.
 
     \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 0
 
-    Add a SensorGesture QML element.
+    Add a SensorGesture QML type.
 
     \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 1
 
-    In the SensorGesture element, specify which gesture to be used.
+    In the SensorGesture type, specify which gesture to be used.
     Note that this can be a comma separated list. Here we are only interested in one
     gesture recognizer.
 
diff --git a/doc/src/imports/qtmobilitysensors1.qdoc b/doc/src/imports/qtmobilitysensors1.qdoc
index b4906ed2..cf4bc869 100644
--- a/doc/src/imports/qtmobilitysensors1.qdoc
+++ b/doc/src/imports/qtmobilitysensors1.qdoc
@@ -57,19 +57,19 @@
     \li The QTapSensor::returnDoubleTapEvents property cannot be used because QML cannot access dynamic properties.
     \endlist
 
-    \section1 QML Sensor Elements
+    \section1 QML Sensor types
 
-    These elements represent specific types of sensors.
+    These types represent specific types of sensors.
 
     \annotatedlist qml-sensors_type
 
-    \section1 QML Reading Elements
+    \section1 QML Reading Types
 
     The data from a sensor comes through a reading class.
 
     \annotatedlist qml-sensors_reading
 
-    \section1 Alphabetical Listing of QML Elements
+    \section1 Alphabetical Listing of QML Types
 
 */
 
diff --git a/doc/src/imports/qtsensors5.qdoc b/doc/src/imports/qtsensors5.qdoc
index c3e6a2a0..3f3bb6de 100644
--- a/doc/src/imports/qtsensors5.qdoc
+++ b/doc/src/imports/qtsensors5.qdoc
@@ -56,9 +56,9 @@
     The emulator supports simulating the Ambient Light, Orientation, Compass and Proximity sensors.
 
     The \l {Qt Sensors - QML example} contains code for using the the \l TiltSensor, \l AmbientLightSensor
-    and ProximitySensor elements.
+    and ProximitySensor types.
 
-    \section1 QML Elements
+    \section1 QML Types
 
 */
 
diff --git a/doc/src/porting.qdoc b/doc/src/porting.qdoc
index 48b904cf..cb899439 100644
--- a/doc/src/porting.qdoc
+++ b/doc/src/porting.qdoc
@@ -43,7 +43,7 @@
     QML import. QML applications should not require any changes to continue operating.
 
     Applications using the legacy QML import may not be able to trivially port over
-    to the new QML import because the new QML import does not provide elements for
+    to the new QML import because the new QML import does not provide types for
     every sensor like the legacy QML import does.
 
     \table
diff --git a/examples/QtSensors/QtSensors_grue/import/main.cpp b/examples/QtSensors/QtSensors_grue/import/main.cpp
index 6c327032..d8a6d5ab 100644
--- a/examples/QtSensors/QtSensors_grue/import/main.cpp
+++ b/examples/QtSensors/QtSensors_grue/import/main.cpp
@@ -112,11 +112,11 @@ QT_END_NAMESPACE
     \qmlclass GrueSensor GrueSensor
     \inherits QtMobility.sensors1::Sensor
     \inqmlmodule Grue 1
-    \brief The GrueSensor element reports on your chance of being eaten by a Grue.
+    \brief The GrueSensor type reports on your chance of being eaten by a Grue.
 
-    The GrueSensor element reports on your chance of being eaten by a Grue.
+    The GrueSensor type reports on your chance of being eaten by a Grue.
 
-    This element wraps the GrueSensor class. Please see the documentation for
+    This type wraps the GrueSensor class. Please see the documentation for
     GrueSensor for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -126,14 +126,14 @@ QT_END_NAMESPACE
     \qmlclass GrueSensorReading GrueSensorReading
     \inherits QtMobility.sensors1::SensorReading
     \inqmlmodule Grue 1
-    \brief The GrueSensorReading element holds the most recent GrueSensor reading.
+    \brief The GrueSensorReading type holds the most recent GrueSensor reading.
 
-    The GrueSensorReading element holds the most recent GrueSensor reading.
+    The GrueSensorReading type holds the most recent GrueSensor reading.
 
-    This element wraps the GrueSensorReading class. Please see the documentation for
+    This type wraps the GrueSensorReading class. Please see the documentation for
     GrueSensorReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp
index 0c296192..12b35f9e 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 /*
     \class QSensorExplorer
-    \brief The QSensorExplorer element provides an easy access for reading all avalaible sensors installed on the system.
+    \brief The QSensorExplorer type provides an easy access for reading all avalaible sensors installed on the system.
 */
 
 /*
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp
index 0360e0d2..00f43e44 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*
     \class QPropertyInfo
-    \brief The QPropertyInfo element provides an easy access for reading and writing the property values.
+    \brief The QPropertyInfo type provides an easy access for reading and writing the property values.
 */
 
 /*
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp
index 68dccf46..dd9d0365 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*
     \class QSensorItem
-    \brief The QSensorItem element provides information about the meta-datas from a sensors installed on the system.
+    \brief The QSensorItem type provides information about the meta-datas from a sensors installed on the system.
 */
 
 /*
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index b81bdd3d..4d1b1ced 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -192,14 +192,14 @@ QT_END_NAMESPACE
 /*!
     \qmlclass QtMobility.sensors1::Sensor QSensor
     \inqmlmodule QtMobility.sensors 1
-    \brief The Sensor element serves as a base type for sensors.
+    \brief The Sensor type serves as a base type for sensors.
 
-    The Sensor element serves as a base type for sensors.
+    The Sensor type serves as a base type for sensors.
 
-    This element wraps the QSensor class. Please see the documentation for
+    This type wraps the QSensor class. Please see the documentation for
     QSensor for details.
 
-    This element cannot be directly created. Please use one of the sub-classes instead.
+    This type cannot be directly created. Please use one of the sub-classes instead.
 
     \sa {QtMobility.sensors QML Limitations}
 */
@@ -237,14 +237,14 @@ QT_END_NAMESPACE
 /*!
     \qmlclass SensorReading QSensorReading
     \inqmlmodule QtMobility.sensors 1
-    \brief The SensorReading element serves as a base type for sensor readings.
+    \brief The SensorReading type serves as a base type for sensor readings.
 
-    The SensorReading element serves as a base type for sensor readings.
+    The SensorReading type serves as a base type for sensor readings.
 
-    This element wraps the QSensorReading class. Please see the documentation for
+    This type wraps the QSensorReading class. Please see the documentation for
     QSensorReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -258,13 +258,13 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_type
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::Sensor
-    \brief The Accelerometer element reports on linear acceleration
+    \brief The Accelerometer type reports on linear acceleration
            along the X, Y and Z axes.
 
-    The Accelerometer element reports on linear acceleration
+    The Accelerometer type reports on linear acceleration
     along the X, Y and Z axes.
 
-    This element wraps the QAccelerometer class. Please see the documentation for
+    This type wraps the QAccelerometer class. Please see the documentation for
     QAccelerometer for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -287,14 +287,14 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_reading
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::SensorReading
-    \brief The AccelerometerReading element holds the most recent Accelerometer reading.
+    \brief The AccelerometerReading type holds the most recent Accelerometer reading.
 
-    The AccelerometerReading element holds the most recent Accelerometer reading.
+    The AccelerometerReading type holds the most recent Accelerometer reading.
 
-    This element wraps the QAccelerometerReading class. Please see the documentation for
+    This type wraps the QAccelerometerReading class. Please see the documentation for
     QAccelerometerReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -317,11 +317,11 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_type
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::Sensor
-    \brief The AmbientLightSensor element repors on ambient lighting conditions.
+    \brief The AmbientLightSensor type repors on ambient lighting conditions.
 
-    The AmbientLightSensor element repors on ambient lighting conditions.
+    The AmbientLightSensor type repors on ambient lighting conditions.
 
-    This element wraps the QAmbientLightSensor class. Please see the documentation for
+    This type wraps the QAmbientLightSensor class. Please see the documentation for
     QAmbientLightSensor for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -344,14 +344,14 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_reading
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::SensorReading
-    \brief The AmbientLightReading element holds the most AmbientLightSensor reading.
+    \brief The AmbientLightReading type holds the most AmbientLightSensor reading.
 
-    The AmbientLightReading element holds the most AmbientLightSensor reading.
+    The AmbientLightReading type holds the most AmbientLightSensor reading.
 
-    This element wraps the QAmbientLightReading class. Please see the documentation for
+    This type wraps the QAmbientLightReading class. Please see the documentation for
     QAmbientLightReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -374,11 +374,11 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_type
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::Sensor
-    \brief The Compass element reports on heading using magnetic north as a reference.
+    \brief The Compass type reports on heading using magnetic north as a reference.
 
-    The Compass element reports on heading using magnetic north as a reference.
+    The Compass type reports on heading using magnetic north as a reference.
 
-    This element wraps the QCompass class. Please see the documentation for
+    This type wraps the QCompass class. Please see the documentation for
     QCompass for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -401,14 +401,14 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_reading
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::SensorReading
-    \brief The CompassReading element holds the most recent Compass reading.
+    \brief The CompassReading type holds the most recent Compass reading.
 
-    The CompassReading element holds the most recent Compass reading.
+    The CompassReading type holds the most recent Compass reading.
 
-    This element wraps the QCompassReading class. Please see the documentation for
+    This type wraps the QCompassReading class. Please see the documentation for
     QCompassReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -426,13 +426,13 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_type
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::Sensor
-    \brief The Magnetometer element reports on magnetic field strength
+    \brief The Magnetometer type reports on magnetic field strength
            along the Z, Y and Z axes.
 
-    The Magnetometer element reports on magnetic field strength
+    The Magnetometer type reports on magnetic field strength
     along the Z, Y and Z axes.
 
-    This element wraps the QMagnetometer class. Please see the documentation for
+    This type wraps the QMagnetometer class. Please see the documentation for
     QMagnetometer for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -455,14 +455,14 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_reading
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::SensorReading
-    \brief The MagnetometerReading element holds the most recent Magnetometer reading.
+    \brief The MagnetometerReading type holds the most recent Magnetometer reading.
 
-    The MagnetometerReading element holds the most recent Magnetometer reading.
+    The MagnetometerReading type holds the most recent Magnetometer reading.
 
-    This element wraps the QMagnetometerReading class. Please see the documentation for
+    This type wraps the QMagnetometerReading class. Please see the documentation for
     QMagnetometerReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -490,11 +490,11 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_type
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::Sensor
-    \brief The OrientationSensor element reports device orientation.
+    \brief The OrientationSensor type reports device orientation.
 
-    The OrientationSensor element reports device orientation.
+    The OrientationSensor type reports device orientation.
 
-    This element wraps the QOrientationSensor class. Please see the documentation for
+    This type wraps the QOrientationSensor class. Please see the documentation for
     QOrientationSensor for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -517,14 +517,14 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_reading
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::SensorReading
-    \brief The OrientationReading element holds the most recent OrientationSensor reading.
+    \brief The OrientationReading type holds the most recent OrientationSensor reading.
 
-    The OrientationReading element holds the most recent OrientationSensor reading.
+    The OrientationReading type holds the most recent OrientationSensor reading.
 
-    This element wraps the QOrientationReading class. Please see the documentation for
+    This type wraps the QOrientationReading class. Please see the documentation for
     QOrientationReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -547,11 +547,11 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_type
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::Sensor
-    \brief The ProximitySensor element reports on object proximity.
+    \brief The ProximitySensor type reports on object proximity.
 
-    The ProximitySensor element reports on object proximity.
+    The ProximitySensor type reports on object proximity.
 
-    This element wraps the QProximitySensor class. Please see the documentation for
+    This type wraps the QProximitySensor class. Please see the documentation for
     QProximitySensor for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -574,14 +574,14 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_reading
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::SensorReading
-    \brief The ProximityReading element holds the most recent ProximitySensor reading.
+    \brief The ProximityReading type holds the most recent ProximitySensor reading.
 
-    The ProximityReading element holds the most recent ProximitySensor reading.
+    The ProximityReading type holds the most recent ProximitySensor reading.
 
-    This element wraps the QProximityReading class. Please see the documentation for
+    This type wraps the QProximityReading class. Please see the documentation for
     QProximityReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -594,13 +594,13 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_type
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::Sensor
-    \brief The RotationSensor element reports on device rotation
+    \brief The RotationSensor type reports on device rotation
            around the X, Y and Z axes.
 
-    The RotationSensor element reports on device rotation
+    The RotationSensor type reports on device rotation
     around the X, Y and Z axes.
 
-    This element wraps the QRotationSensor class. Please see the documentation for
+    This type wraps the QRotationSensor class. Please see the documentation for
     QRotationSensor for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -623,14 +623,14 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_reading
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::SensorReading
-    \brief The RotationReading element holds the most recent RotationSensor reading.
+    \brief The RotationReading type holds the most recent RotationSensor reading.
 
-    The RotationReading element holds the most recent RotationSensor reading.
+    The RotationReading type holds the most recent RotationSensor reading.
 
-    This element wraps the QRotationReading class. Please see the documentation for
+    This type wraps the QRotationReading class. Please see the documentation for
     QRotationReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -653,13 +653,13 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_type
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::Sensor
-    \brief The TapSensor element reports tap and double tap events
+    \brief The TapSensor type reports tap and double tap events
            along the X, Y and Z axes.
 
-    The TapSensor element reports tap and double tap events
+    The TapSensor type reports tap and double tap events
     along the X, Y and Z axes.
 
-    This element wraps the QTapSensor class. Please see the documentation for
+    This type wraps the QTapSensor class. Please see the documentation for
     QTapSensor for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -682,14 +682,14 @@ QT_END_NAMESPACE
     \ingroup qml-sensors_reading
     \inqmlmodule QtMobility.sensors 1
     \inherits QtMobility.sensors1::SensorReading
-    \brief The TapReading element holds the most recent TapSensor reading.
+    \brief The TapReading type holds the most recent TapSensor reading.
 
-    The TapReading element holds the most recent TapSensor reading.
+    The TapReading type holds the most recent TapSensor reading.
 
-    This element wraps the QTapReading class. Please see the documentation for
+    This type wraps the QTapReading class. Please see the documentation for
     QTapReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -718,11 +718,11 @@ QT_END_NAMESPACE
     \inqmlmodule QtMobility.sensors 1
     \since QtMobility.sensors 1.2
     \inherits QtMobility.sensors1::Sensor
-    \brief The LightSensor element reports on light levels using LUX.
+    \brief The LightSensor type reports on light levels using LUX.
 
-    The LightSensor element reports on light levels using LUX.
+    The LightSensor type reports on light levels using LUX.
 
-    This element wraps the QLightSensor class. Please see the documentation for
+    This type wraps the QLightSensor class. Please see the documentation for
     QLightSensor for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -746,14 +746,14 @@ QT_END_NAMESPACE
     \inqmlmodule QtMobility.sensors 1
     \since QtMobility.sensors 1.2
     \inherits QtMobility.sensors1::SensorReading
-    \brief The LightReading element holds the most recent LightSensor reading.
+    \brief The LightReading type holds the most recent LightSensor reading.
 
-    The LightReading element holds the most recent LightSensor reading.
+    The LightReading type holds the most recent LightSensor reading.
 
-    This element wraps the QLightReading class. Please see the documentation for
+    This type wraps the QLightReading class. Please see the documentation for
     QLightReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -767,10 +767,10 @@ QT_END_NAMESPACE
     \inqmlmodule QtMobility.sensors 1
     \since QtMobility.sensors 1.2
     \inherits QtMobility.sensors1::Sensor
-    \brief The Gyroscope element reports on rotational acceleration
+    \brief The Gyroscope type reports on rotational acceleration
            around the X, Y and Z axes.
 
-    This element wraps the QGyroscope class. Please see the documentation for
+    This type wraps the QGyroscope class. Please see the documentation for
     QGyroscope for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -794,14 +794,14 @@ QT_END_NAMESPACE
     \inqmlmodule QtMobility.sensors 1
     \since QtMobility.sensors 1.2
     \inherits QtMobility.sensors1::SensorReading
-    \brief The GyroscopeReading element holds the most recent Gyroscope reading.
+    \brief The GyroscopeReading type holds the most recent Gyroscope reading.
 
-    The GyroscopeReading element holds the most recent Gyroscope reading.
+    The GyroscopeReading type holds the most recent Gyroscope reading.
 
-    This element wraps the QGyroscopeReading class. Please see the documentation for
+    This type wraps the QGyroscopeReading class. Please see the documentation for
     QGyroscopeReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
@@ -825,9 +825,9 @@ QT_END_NAMESPACE
     \inqmlmodule QtMobility.sensors 1
     \since QtMobility.sensors 1.3
     \inherits QtMobility.sensors1::Sensor
-    \brief The IRProximitySensor element reports on infra-red reflectance values.
+    \brief The IRProximitySensor type reports on infra-red reflectance values.
 
-    This element wraps the QIRProximitySensor class. Please see the documentation for
+    This type wraps the QIRProximitySensor class. Please see the documentation for
     QIRProximitySensor for details.
 
     \sa {QtMobility.sensors QML Limitations}
@@ -851,14 +851,14 @@ QT_END_NAMESPACE
     \inqmlmodule QtMobility.sensors 1
     \since QtMobility.sensors 1.3
     \inherits QtMobility.sensors1::SensorReading
-    \brief The IRProximityReading element holds the most recent IR proximity reading.
+    \brief The IRProximityReading type holds the most recent IR proximity reading.
 
-    The IRProximityReading element holds the most recent IR proximity reading.
+    The IRProximityReading type holds the most recent IR proximity reading.
 
-    This element wraps the QIRProximityReading class. Please see the documentation for
+    This type wraps the QIRProximityReading class. Please see the documentation for
     QIRProximityReading for details.
 
-    This element cannot be directly created.
+    This type cannot be directly created.
 */
 
 /*!
diff --git a/src/imports/sensors2/qsensor2ambientlight.cpp b/src/imports/sensors2/qsensor2ambientlight.cpp
index 28f46eda..c9a0b109 100644
--- a/src/imports/sensors2/qsensor2ambientlight.cpp
+++ b/src/imports/sensors2/qsensor2ambientlight.cpp
@@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE
     \since QtSensors 5.0
     \brief Provides access to the current ambient light level.
 
-    This element provides easy access to determine the ambient light by using the ambient light sensor.
+    This type provides easy access to determine the ambient light by using the ambient light sensor.
     For example brightening the screen according to whether the device is in full sunlight or not.
 
-    This element is part of the \b{QtSensors 5} module.
+    This type is part of the \b{QtSensors 5} module.
 
-    The \l {Qt Sensors - QML example} is an example how to use this QML element.
+    The \l {Qt Sensors - QML example} is an example how to use this QML type.
 */
 QSensor2AmbientLight::QSensor2AmbientLight(QObject* parent)
     : qsensor2common(parent)
diff --git a/src/imports/sensors2/qsensor2common.cpp b/src/imports/sensors2/qsensor2common.cpp
index 2deb94f2..91c296d8 100644
--- a/src/imports/sensors2/qsensor2common.cpp
+++ b/src/imports/sensors2/qsensor2common.cpp
@@ -48,11 +48,11 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass Sensor qsensor2common
     \inqmlmodule QtSensors 5
-    \brief The Sensor element serves as a base type for sensors.
+    \brief The Sensor type serves as a base type for sensors.
 
-    The Sensor element serves as a base type for sensors.
+    The Sensor type serves as a base type for sensors.
 
-    This element cannot be directly created. Please use one of the sub-classes instead.
+    This type cannot be directly created. Please use one of the sub-classes instead.
 */
 
 qsensor2common::qsensor2common(QObject *parent)
diff --git a/src/imports/sensors2/qsensor2gesture.cpp b/src/imports/sensors2/qsensor2gesture.cpp
index 63b5f759..cb4f1559 100644
--- a/src/imports/sensors2/qsensor2gesture.cpp
+++ b/src/imports/sensors2/qsensor2gesture.cpp
@@ -53,15 +53,15 @@ QT_BEGIN_NAMESPACE
     \since QtSensors 5.0
     \brief Provides notifications when sensor-based gestures are detected.
 
-    This element provides notification when sensor gestures are triggered.
+    This type provides notification when sensor gestures are triggered.
 
-    This element is part of the \b{QtSensors 5} module.
+    This type is part of the \b{QtSensors 5} module.
 
-    The following QML code creates a "shake" and "template" SensorGesture QML element, and
-    displays the detected gesture in a text element.
+    The following QML code creates a "shake" and "template" SensorGesture QML type, and
+    displays the detected gesture in a text type.
 
     QtSensors.shake gesture is available with the Qt Sensors API, but the QtSensors.SecondCounter
-    sensor gesture is provided as example code for the \l {Qt Sensors - SensorGesture QML Element example}
+    sensor gesture is provided as example code for the \l {Qt Sensors - SensorGesture QML Type example}
 
     \qml
     Item {
@@ -134,7 +134,7 @@ QStringList QSensor2Gesture::availableGestures()
 /*!
     \qmlproperty stringlist QtSensors5::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 element is enabled.
+    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
diff --git a/src/imports/sensors2/qsensor2proximity.cpp b/src/imports/sensors2/qsensor2proximity.cpp
index d126dc97..5c92ad1b 100644
--- a/src/imports/sensors2/qsensor2proximity.cpp
+++ b/src/imports/sensors2/qsensor2proximity.cpp
@@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE
     \since QtSensors 5.0
     \brief Provides access to the proximity sensor.
 
-    This element allows determining if something is held in close proximity to the device, such
+    This type allows determining if something is held in close proximity to the device, such
     as determining if the user is holding the device to their ear.
 
-    This element is part of the \b{QtSensors 5} module.
+    This type is part of the \b{QtSensors 5} module.
 
-    The \l {Qt Sensors - QML example} is an example how to use this QML element.
+    The \l {Qt Sensors - QML example} is an example how to use this QML type.
 
 */
 
diff --git a/src/imports/sensors2/qsensor2tilt.cpp b/src/imports/sensors2/qsensor2tilt.cpp
index 99d4a601..189a1b2b 100644
--- a/src/imports/sensors2/qsensor2tilt.cpp
+++ b/src/imports/sensors2/qsensor2tilt.cpp
@@ -57,13 +57,13 @@ QT_BEGIN_NAMESPACE
     \since QtSensors 5.0
     \brief Provides access to the current X and Y axis rotation angles of the device.
 
-     This element provides tilt data from the rotation around the x and y axis of the device using
+     This type provides tilt data from the rotation around the x and y axis of the device using
     the accelerometer sensor. Like for a marble and maze game, where the marble is rolled
     around the screen according to the user tilting the device.
 
-    This element is part of the \b{QtSensors 5} module.
+    This type is part of the \b{QtSensors 5} module.
 
-    The \l {Qt Sensors - QML example} is an example how to use this QML element.
+    The \l {Qt Sensors - QML example} is an example how to use this QML type.
 
 */
 QSensor2Tilt::QSensor2Tilt(QObject* parent)