143 files changed, 75 insertions, 75 deletions

diff --git a/doc/src/examples/accelbubble.qdoc b/doc/src/examples/accelbubble.qdoc
index ea741282..db3f0311 100644
--- a/doc/src/examples/accelbubble.qdoc
+++ b/doc/src/examples/accelbubble.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example QtSensors/QtSensors_accelbubble
+    \example sensors/accelbubble
     \title Qt Sensors - Accel Bubble
     \brief The AccelBubble example demonstrates the Legacy Accelerometer QML type.
     \ingroup qtsensors-examples
@@ -36,19 +36,19 @@
 
     Import the Legacy Sensors Declarative module.
 
-\snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml 0
+\snippet ../examples/sensors/accelbubble/accelbubble.qml 0
 
     Add an Accelerometer QML type.
 
-\snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml  1
+\snippet ../examples/sensors/accelbubble/accelbubble.qml  1
 
     Use the 'active' property to start the sensor
 
-\snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml  2
+\snippet ../examples/sensors/accelbubble/accelbubble.qml  2
 
     Move the bubble according to a factor of the accelerator sensor
 
-\snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml  3
+\snippet ../examples/sensors/accelbubble/accelbubble.qml  3
 
 */
 
diff --git a/doc/src/examples/cubehouse.qdoc b/doc/src/examples/cubehouse.qdoc
index 15e52fac..021906eb 100644
--- a/doc/src/examples/cubehouse.qdoc
+++ b/doc/src/examples/cubehouse.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example QtSensors/QtSensors_cubehouse
+    \example sensors/cubehouse
     \title Qt Sensors - Cube House QML Accelerometer example
     \ingroup qtsensors-examples
     \brief The Cube House example demonstrates the use of the accelerometer to drive a camera to create a pseudo-3D effect.
@@ -37,24 +37,24 @@
 
     Import the QtMobility.sensors declarative plugin:
 
-\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 0
+\snippet ../examples/sensors/cubehouse/cubehouse.qml 0
 
     Add the Accelerometer QML types into your qml file.
 
-\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 1
+\snippet ../examples/sensors/cubehouse/cubehouse.qml 1
 
     In additional two properties are added to save the calculated pitch and roll values:
 
-\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 2
+\snippet ../examples/sensors/cubehouse/cubehouse.qml 2
 
     Reading out the Accelerometer data can be done by implementing the 'onReadingChanged' slot and
     accessing the 'reading' property from the Accelerometer type:
 
-\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 3
+\snippet ../examples/sensors/cubehouse/cubehouse.qml 3
 
     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
+\snippet ../examples/sensors/cubehouse/cubehouse.qml 4
 
 */
 
diff --git a/doc/src/examples/grue.qdoc b/doc/src/examples/grue.qdoc
index 37a602fe..6478f3bb 100644
--- a/doc/src/examples/grue.qdoc
+++ b/doc/src/examples/grue.qdoc
@@ -57,7 +57,7 @@
 */
 
 /*!
-    \example QtSensors/QtSensors_grue/lib
+    \example sensors/grue/lib
     \title Grue Sensor Definition
     \brief The Grue sensor is defined in a library so that applications can use it.
 
@@ -78,7 +78,7 @@
 */
 
 /*!
-    \example QtSensors/QtSensors_grue/plugin
+    \example sensors/grue/plugin
     \title Grue Sensor Implementation
     \brief The Grue sensor implementation lives in a plugin that is loaded by the Qt Sensors library.
 
@@ -94,13 +94,13 @@
     light sensor. In the start method, the backend should be sure to call the
     sensorStopped() or sensorBusy() methods if it cannot start.
 
-    \snippet ../examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp start
+    \snippet ../examples/sensors/grue/plugin/gruesensorimpl.cpp start
 
     The setReading method is needed so that the sensors library knows where the
     readings are coming from. This backend has a local copy of the reading so
     it passes a pointer to the function.
 
-    \snippet ../examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp setReading
+    \snippet ../examples/sensors/grue/plugin/gruesensorimpl.cpp setReading
 
     However it is also possible to pass null to the setReading method in which
     case the sensors library will create an instance and return a pointer.
@@ -123,7 +123,7 @@
 */
 
 /*!
-    \example QtSensors/QtSensors_grue/console_app
+    \example sensors/grue/console_app
     \title Grue Sensor Console Application
     \brief The Grue sensor console application demonstrates use of the Grue sensor.
 
@@ -135,7 +135,7 @@
 */
 
 /*!
-    \example QtSensors/QtSensors_grue/import
+    \example sensors/grue/import
     \title Grue Sensor QML Import
     \brief The Grue sensor QML import exports the GrueSensor class as a QML type.
 
@@ -145,7 +145,7 @@
 */
 
 /*!
-    \example QtSensors/QtSensors_grue
+    \example sensors/grue
     \title Grue Sensor QML Application
     \brief The Grue sensor QML application demonstrates use of the GrueSensor QML type.
 
@@ -154,7 +154,7 @@
     this example or it will not be able to find its dependencies.
 
     \code
-    qmlscene QtSensors_grue.qml
+    qmlscene grue.qml
     \endcode
 
     \sa {Qt Sensors - Grue Sensor Example}
diff --git a/doc/src/examples/maze.qdoc b/doc/src/examples/maze.qdoc
index edd7e65e..0a278a53 100644
--- a/doc/src/examples/maze.qdoc
+++ b/doc/src/examples/maze.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example QtSensors/QtSensors_maze
+    \example sensors/maze
     \title Qt Sensors - Maze QML Example
     \ingroup qtsensors-examples
     \image maze.png
@@ -39,29 +39,29 @@
 
     Import the QtSensors 5.x declarative plugin:
 
-    \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 0
+    \snippet ../examples/sensors/maze/maze.qml 0
 
     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:
 
-    \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 1
+    \snippet ../examples/sensors/maze/maze.qml 1
 
     Starting the sensor can be done by setting the 'enabled' property to true:
 
-    \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 2
+    \snippet ../examples/sensors/maze/maze.qml 2
 
     The mouse should move by a factor of the tilt value:
 
-    \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 3
+    \snippet ../examples/sensors/maze/maze.qml 3
 
     The walk direction of the mouse takes into account some collision detection:
 
-    \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 4
+    \snippet ../examples/sensors/maze/maze.qml 4
 
     The rotation of the mouse image is determined according to the angle that the mouse is moving.
 
-    \snippet ../examples/QtSensors/QtSensors_maze/Mouse.qml 0
+    \snippet ../examples/sensors/maze/Mouse.qml 0
 
 */
 
diff --git a/doc/src/examples/qmlqtsensors.qdoc b/doc/src/examples/qmlqtsensors.qdoc
index 1dfe3202..422f2d08 100644
--- a/doc/src/examples/qmlqtsensors.qdoc
+++ b/doc/src/examples/qmlqtsensors.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example QtSensors/QtSensors_qmlqtsensors
+    \example sensors/qmlqtsensors
     \title Qt Sensors - QML example
     \ingroup qtsensors-examples
     \image qmlqtsensors.png
@@ -39,32 +39,32 @@
 
     Import the QtSensors 5.x declarative plugin:
 
-    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 0
+    \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 0
 
     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
+    \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 1
 
     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
+    \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 2
 
     Reading the data can be done for each sensor type like following:
 
     \l {QtSensors5::TiltSensor} {TiltSensor}
 
-    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 3
-    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 4
+    \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 3
+    \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 4
 
     \l {QtSensors5::AmbientLightSensor} {AmbientLightSensor}
 
-    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 5
+    \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 5
 
     \l {QtSensors5::ProximitySensor} {ProximitySensor}
 
-    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 6
+    \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 6
 */
 
diff --git a/doc/src/examples/qmlsensorgtestures.qdoc b/doc/src/examples/qmlsensorgtestures.qdoc
index f655d2eb..a4f4fcd3 100644
--- a/doc/src/examples/qmlsensorgtestures.qdoc
+++ b/doc/src/examples/qmlsensorgtestures.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example QtSensors/QtSensors_qmlsensorgestures
+    \example sensors/qmlsensorgestures
     \title Qt Sensors - SensorGesture QML Type example
     \ingroup qtsensors-examples
 
@@ -37,25 +37,25 @@
 
     Import the QtSensors 5.x declarative plugin:
 
-\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml 0
+\snippet ../examples/sensors/qmlsensorgestures/GestureView.qml 0
 
    Add the SensorGesture QML type into your qml file.
 
-\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml 1
+\snippet ../examples/sensors/qmlsensorgestures/GestureView.qml 1
 
    Each SensorGesture QML type contains a property called gestures.
 
    In this example an alias 'gestureid' for this property is used.
 
-\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml 2
+\snippet ../examples/sensors/qmlsensorgestures/GestureView.qml 2
 
    By using this alias property you define which gestures should be used:
 
-\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.qml 3
+\snippet ../examples/sensors/qmlsensorgestures/qmlsensorgestures.qml 3
 
    A list of all available gestures can be created by calling the 'availableGestures' property:
 
-\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureList.qml 4
+\snippet ../examples/sensors/qmlsensorgestures/GestureList.qml 4
 
 \sa {Qt Sensors - ShakeIt QML Example}
 \sa {Qt Sensor Gestures}
diff --git a/doc/src/examples/sensor_explorer.qdoc b/doc/src/examples/sensor_explorer.qdoc
index 31eb4748..1869dff5 100644
--- a/doc/src/examples/sensor_explorer.qdoc
+++ b/doc/src/examples/sensor_explorer.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example QtSensors/QtSensors_sensor_explorer
+    \example sensors/sensor_explorer
     \title Qt Sensors - Explorer QML example
     \ingroup qtsensors-examples
     \image sensorexplorer.png
@@ -55,31 +55,31 @@
 
     Import the Explorer 1.0 declarative plugin:
 
-    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 0
+    \snippet ../examples/sensors/sensor_explorer/sensor_explorer.qml 0
 
     Create a SensorExplorer QML item:
 
-    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 1
+    \snippet ../examples/sensors/sensor_explorer/sensor_explorer.qml 1
 
     You can retrieve a list of all available sensors using the SensorExplorer:
 
-    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 2
+    \snippet ../examples/sensors/sensor_explorer/sensor_explorer.qml 2
 
     To retrieve the properties of a SensorItem use:
 
-    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 3
+    \snippet ../examples/sensors/sensor_explorer/sensor_explorer.qml 3
 
     Changing a property value can be done like:
 
-    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 4
+    \snippet ../examples/sensors/sensor_explorer/sensor_explorer.qml 4
 
     Starting and stopping a sensor can be done like:
 
-    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 5
+    \snippet ../examples/sensors/sensor_explorer/sensor_explorer.qml 5
 */
 
 /*!
-    \example QtSensors/QtSensors_sensor_explorer/import
+    \example sensors/sensor_explorer/import
     \title Sensor Explorer QML Import
 
     \section2 Sensor Explorer Declarative Plugin
diff --git a/doc/src/examples/sensorgestures.qdoc b/doc/src/examples/sensorgestures.qdoc
index 4940dfb5..d05cd55a 100644
--- a/doc/src/examples/sensorgestures.qdoc
+++ b/doc/src/examples/sensorgestures.qdoc
@@ -45,17 +45,17 @@
     In order to know about custom signals that may be available, we need to ask the QSensorGestureManager about them,
 
     Using the QSensorGesture::gestureIds() function, the manager will return a QStringList of known and valid gesture Ids.
-    \snippet ../examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp 0
+    \snippet ../examples/sensors/sensorgestures/mainwindow.cpp 0
 
     We can then use this to create a QSensorGesture object that we can use to connect signals to,
     and start the detection process. A QSensorGesture object will take a list of one or more
     recognizer ids in it's constructor.
 
-    \snippet ../examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp 1
+    \snippet ../examples/sensors/sensorgestures/mainwindow.cpp 1
 
     and later stop the detection process.
 
-    \snippet ../examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp 2
+    \snippet ../examples/sensors/sensorgestures/mainwindow.cpp 2
 
     The QSensorGesture object will contain all the signals of the valid  requested recognizers found on the system.
 
diff --git a/doc/src/examples/shakeit.qdoc b/doc/src/examples/shakeit.qdoc
index 05bb28bc..fca2d2a3 100644
--- a/doc/src/examples/shakeit.qdoc
+++ b/doc/src/examples/shakeit.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example QtSensors/QtSensors_shakeit
+    \example sensors/shakeit
     \title Qt Sensors - ShakeIt QML Example
     \ingroup qtsensors-examples
     \image shakeit.png
@@ -39,25 +39,25 @@
 
     Import the Sensors Declarative module.
 
-    \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 0
+    \snippet ../examples/sensors/shakeit/shakeit.qml 0
 
     Add a SensorGesture QML type.
 
-    \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 1
+    \snippet ../examples/sensors/shakeit/shakeit.qml 1
 
     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.
 
-    \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 2
+    \snippet ../examples/sensors/shakeit/shakeit.qml 2
 
     Use the 'enabled' property to start the sensor gesture.
 
-    \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 3
+    \snippet ../examples/sensors/shakeit/shakeit.qml 3
 
     Use the onDetected signal to do stuff.
 
-    \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 4
+    \snippet ../examples/sensors/shakeit/shakeit.qml 4
 
     There are additional gestures to shake which are supported:
     whip, twistRight, hover, cover, turnover and pickup.
diff --git a/doc/src/qtsensors-cpp.qdoc b/doc/src/qtsensors-cpp.qdoc
index 6cdd6a4b..3df97f94 100644
--- a/doc/src/qtsensors-cpp.qdoc
+++ b/doc/src/qtsensors-cpp.qdoc
@@ -101,7 +101,7 @@ This code does not require any compile-time links to \l QAccelerometer or
 
 \snippet snippets/sensors/start.cpp Starting a sensor
 
-You can discover all of this information at runtime too. The QtSensors_sensor_explorer example
+You can discover all of this information at runtime too. The sensor_explorer example
 shows you information about available sensors.
 
 \section1 Front end, back end
diff --git a/examples/QtSensors/QtSensors.pro b/examples/QtSensors/QtSensors.pro
deleted file mode 100644
index fd775ab3..00000000
--- a/examples/QtSensors/QtSensors.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    QtSensors_accel \
-    QtSensors_accelbubble \
-    QtSensors_cubehouse \
-    QtSensors_grue \
-    QtSensors_qmlsensorgestures \
-    QtSensors_maze \
-    QtSensors_qmlqtsensors \
-    QtSensors_sensor_explorer \
-    QtSensors_shakeit
-
-!isEmpty(QT.widgets.name):SUBDIRS += \
-    QtSensors_sensorgestures
-
diff --git a/examples/examples.pro b/examples/examples.pro
index 94375404..0685c62c 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS += QtSensors
+SUBDIRS += sensors
diff --git a/examples/QtSensors/QtSensors_accel/QtSensors_accel.pro b/examples/sensors/accel/accel.pro
index 86303eca..86303eca 100644
--- a/examples/QtSensors/QtSensors_accel/QtSensors_accel.pro
+++ b/examples/sensors/accel/accel.pro
diff --git a/examples/QtSensors/QtSensors_accel/main.cpp b/examples/sensors/accel/main.cpp
index 012c8c61..012c8c61 100644
--- a/examples/QtSensors/QtSensors_accel/main.cpp
+++ b/examples/sensors/accel/main.cpp
diff --git a/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro b/examples/sensors/accelbubble/accelbubble.pro
index 25b12aaa..25b12aaa 100644
--- a/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro
+++ b/examples/sensors/accelbubble/accelbubble.pro
diff --git a/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml b/examples/sensors/accelbubble/accelbubble.qml
index a212b595..a212b595 100644
--- a/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml
+++ b/examples/sensors/accelbubble/accelbubble.qml
diff --git a/examples/QtSensors/QtSensors_accelbubble/content/Bluebubble2.png b/examples/sensors/accelbubble/content/Bluebubble2.png
index f96126eb..f96126eb 100644
--- a/examples/QtSensors/QtSensors_accelbubble/content/Bluebubble2.png
+++ b/examples/sensors/accelbubble/content/Bluebubble2.png
diff --git a/examples/QtSensors/QtSensors_accelbubble/icon.png b/examples/sensors/accelbubble/icon.png
index d74f1111..d74f1111 100644
--- a/examples/QtSensors/QtSensors_accelbubble/icon.png
+++ b/examples/sensors/accelbubble/icon.png
diff --git a/examples/QtSensors/QtSensors_accelbubble/info.json b/examples/sensors/accelbubble/info.json
index b91dd9fc..b91dd9fc 100644
--- a/examples/QtSensors/QtSensors_accelbubble/info.json
+++ b/examples/sensors/accelbubble/info.json
diff --git a/examples/QtSensors/QtSensors_cubehouse/Cube.qml b/examples/sensors/cubehouse/Cube.qml
index b8afe81f..b8afe81f 100644
--- a/examples/QtSensors/QtSensors_cubehouse/Cube.qml
+++ b/examples/sensors/cubehouse/Cube.qml
diff --git a/examples/QtSensors/QtSensors_cubehouse/Room.qml b/examples/sensors/cubehouse/Room.qml
index 848735b7..848735b7 100644
--- a/examples/QtSensors/QtSensors_cubehouse/Room.qml
+++ b/examples/sensors/cubehouse/Room.qml
diff --git a/examples/QtSensors/QtSensors_cubehouse/Table.qml b/examples/sensors/cubehouse/Table.qml
index 683d28de..683d28de 100644
--- a/examples/QtSensors/QtSensors_cubehouse/Table.qml
+++ b/examples/sensors/cubehouse/Table.qml
diff --git a/examples/QtSensors/QtSensors_cubehouse/content/ground.jpg b/examples/sensors/cubehouse/content/ground.jpg
index 2664b99e..2664b99e 100644
--- a/examples/QtSensors/QtSensors_cubehouse/content/ground.jpg
+++ b/examples/sensors/cubehouse/content/ground.jpg
diff --git a/examples/QtSensors/QtSensors_cubehouse/content/qtlogo.png b/examples/sensors/cubehouse/content/qtlogo.png
index 7d3e97eb..7d3e97eb 100644
--- a/examples/QtSensors/QtSensors_cubehouse/content/qtlogo.png
+++ b/examples/sensors/cubehouse/content/qtlogo.png
diff --git a/examples/QtSensors/QtSensors_cubehouse/content/roof.jpg b/examples/sensors/cubehouse/content/roof.jpg
index 53a35d64..53a35d64 100644
--- a/examples/QtSensors/QtSensors_cubehouse/content/roof.jpg
+++ b/examples/sensors/cubehouse/content/roof.jpg
diff --git a/examples/QtSensors/QtSensors_cubehouse/content/wall.jpg b/examples/sensors/cubehouse/content/wall.jpg
index 7c56e23f..7c56e23f 100644
--- a/examples/QtSensors/QtSensors_cubehouse/content/wall.jpg
+++ b/examples/sensors/cubehouse/content/wall.jpg
diff --git a/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro b/examples/sensors/cubehouse/cubehouse.pro
index 995446c0..995446c0 100644
--- a/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro
+++ b/examples/sensors/cubehouse/cubehouse.pro
diff --git a/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml b/examples/sensors/cubehouse/cubehouse.qml
index 5a1b91f8..5a1b91f8 100644
--- a/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml
+++ b/examples/sensors/cubehouse/cubehouse.qml
diff --git a/examples/QtSensors/QtSensors_cubehouse/icon.png b/examples/sensors/cubehouse/icon.png
index 193ad561..193ad561 100644
--- a/examples/QtSensors/QtSensors_cubehouse/icon.png
+++ b/examples/sensors/cubehouse/icon.png
diff --git a/examples/QtSensors/QtSensors_cubehouse/info.json b/examples/sensors/cubehouse/info.json
index 7b1c5af3..7b1c5af3 100644
--- a/examples/QtSensors/QtSensors_cubehouse/info.json
+++ b/examples/sensors/cubehouse/info.json
diff --git a/examples/QtSensors/QtSensors_cubehouse/mesh/table.3ds b/examples/sensors/cubehouse/mesh/table.3ds
index 3e576bd1..3e576bd1 100644
--- a/examples/QtSensors/QtSensors_cubehouse/mesh/table.3ds
+++ b/examples/sensors/cubehouse/mesh/table.3ds
diff --git a/examples/QtSensors/QtSensors_grue/console_app/console_app.pro b/examples/sensors/grue/console_app/console_app.pro
index 33d43176..33d43176 100644
--- a/examples/QtSensors/QtSensors_grue/console_app/console_app.pro
+++ b/examples/sensors/grue/console_app/console_app.pro
diff --git a/examples/QtSensors/QtSensors_grue/console_app/main.cpp b/examples/sensors/grue/console_app/main.cpp
index dc62e4de..dc62e4de 100644
--- a/examples/QtSensors/QtSensors_grue/console_app/main.cpp
+++ b/examples/sensors/grue/console_app/main.cpp
diff --git a/examples/QtSensors/QtSensors_grue/grue.png b/examples/sensors/grue/grue.png
index f0b070b4..f0b070b4 100644
--- a/examples/QtSensors/QtSensors_grue/grue.png
+++ b/examples/sensors/grue/grue.png
diff --git a/examples/QtSensors/QtSensors_grue/QtSensors_grue.pro b/examples/sensors/grue/grue.pro
index de917bf7..de917bf7 100644
--- a/examples/QtSensors/QtSensors_grue/QtSensors_grue.pro
+++ b/examples/sensors/grue/grue.pro
diff --git a/examples/QtSensors/QtSensors_grue/QtSensors_grue.qml b/examples/sensors/grue/grue.qml
index 05d267c7..05d267c7 100644
--- a/examples/QtSensors/QtSensors_grue/QtSensors_grue.qml
+++ b/examples/sensors/grue/grue.qml
diff --git a/examples/QtSensors/QtSensors_grue/grue.xcf b/examples/sensors/grue/grue.xcf
index 2837ed7e..2837ed7e 100644
--- a/examples/QtSensors/QtSensors_grue/grue.xcf
+++ b/examples/sensors/grue/grue.xcf
diff --git a/examples/QtSensors/QtSensors_grue/icon.png b/examples/sensors/grue/icon.png
index f3f038c7..f3f038c7 100644
--- a/examples/QtSensors/QtSensors_grue/icon.png
+++ b/examples/sensors/grue/icon.png
diff --git a/examples/QtSensors/QtSensors_grue/icon.xcf b/examples/sensors/grue/icon.xcf
index 8416c49f..8416c49f 100644
--- a/examples/QtSensors/QtSensors_grue/icon.xcf
+++ b/examples/sensors/grue/icon.xcf
diff --git a/examples/QtSensors/QtSensors_grue/import/import.pro b/examples/sensors/grue/import/import.pro
index 753e1ef8..753e1ef8 100644
--- a/examples/QtSensors/QtSensors_grue/import/import.pro
+++ b/examples/sensors/grue/import/import.pro
diff --git a/examples/QtSensors/QtSensors_grue/import/main.cpp b/examples/sensors/grue/import/main.cpp
index d8a6d5ab..d8a6d5ab 100644
--- a/examples/QtSensors/QtSensors_grue/import/main.cpp
+++ b/examples/sensors/grue/import/main.cpp
diff --git a/examples/QtSensors/QtSensors_grue/import/plugin.json b/examples/sensors/grue/import/plugin.json
index 0967ef42..0967ef42 100644
--- a/examples/QtSensors/QtSensors_grue/import/plugin.json
+++ b/examples/sensors/grue/import/plugin.json
diff --git a/examples/QtSensors/QtSensors_grue/import/qmldir b/examples/sensors/grue/import/qmldir
index 266b7c11..266b7c11 100644
--- a/examples/QtSensors/QtSensors_grue/import/qmldir
+++ b/examples/sensors/grue/import/qmldir
diff --git a/examples/QtSensors/QtSensors_grue/info.json b/examples/sensors/grue/info.json
index 75129054..75129054 100644
--- a/examples/QtSensors/QtSensors_grue/info.json
+++ b/examples/sensors/grue/info.json
diff --git a/examples/QtSensors/QtSensors_grue/lib/gruesensor.cpp b/examples/sensors/grue/lib/gruesensor.cpp
index b1f00ede..b1f00ede 100644
--- a/examples/QtSensors/QtSensors_grue/lib/gruesensor.cpp
+++ b/examples/sensors/grue/lib/gruesensor.cpp
diff --git a/examples/QtSensors/QtSensors_grue/lib/gruesensor.h b/examples/sensors/grue/lib/gruesensor.h
index 8088988d..8088988d 100644
--- a/examples/QtSensors/QtSensors_grue/lib/gruesensor.h
+++ b/examples/sensors/grue/lib/gruesensor.h
diff --git a/examples/QtSensors/QtSensors_grue/lib/gruesensor_p.h b/examples/sensors/grue/lib/gruesensor_p.h
index 4996e868..4996e868 100644
--- a/examples/QtSensors/QtSensors_grue/lib/gruesensor_p.h
+++ b/examples/sensors/grue/lib/gruesensor_p.h
diff --git a/examples/QtSensors/QtSensors_grue/lib/lib.pro b/examples/sensors/grue/lib/lib.pro
index e048e607..e048e607 100644
--- a/examples/QtSensors/QtSensors_grue/lib/lib.pro
+++ b/examples/sensors/grue/lib/lib.pro
diff --git a/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp b/examples/sensors/grue/plugin/gruesensorimpl.cpp
index e7152a67..e7152a67 100644
--- a/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp
+++ b/examples/sensors/grue/plugin/gruesensorimpl.cpp
diff --git a/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.h b/examples/sensors/grue/plugin/gruesensorimpl.h
index ed89711d..ed89711d 100644
--- a/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.h
+++ b/examples/sensors/grue/plugin/gruesensorimpl.h
diff --git a/examples/QtSensors/QtSensors_grue/plugin/main.cpp b/examples/sensors/grue/plugin/main.cpp
index 36aec298..36aec298 100644
--- a/examples/QtSensors/QtSensors_grue/plugin/main.cpp
+++ b/examples/sensors/grue/plugin/main.cpp
diff --git a/examples/QtSensors/QtSensors_grue/plugin/plugin.json b/examples/sensors/grue/plugin/plugin.json
index 8a55b3ae..8a55b3ae 100644
--- a/examples/QtSensors/QtSensors_grue/plugin/plugin.json
+++ b/examples/sensors/grue/plugin/plugin.json
diff --git a/examples/QtSensors/QtSensors_grue/plugin/plugin.pro b/examples/sensors/grue/plugin/plugin.pro
index 32e127f1..32e127f1 100644
--- a/examples/QtSensors/QtSensors_grue/plugin/plugin.pro
+++ b/examples/sensors/grue/plugin/plugin.pro
diff --git a/examples/QtSensors/QtSensors_grue/qml.pro b/examples/sensors/grue/qml.pro
index e3d021e0..e3d021e0 100644
--- a/examples/QtSensors/QtSensors_grue/qml.pro
+++ b/examples/sensors/grue/qml.pro
diff --git a/examples/QtSensors/QtSensors_maze/Congratulation.qml b/examples/sensors/maze/Congratulation.qml
index a8d6c41c..a8d6c41c 100644
--- a/examples/QtSensors/QtSensors_maze/Congratulation.qml
+++ b/examples/sensors/maze/Congratulation.qml
diff --git a/examples/QtSensors/QtSensors_maze/LabyrinthSquare.qml b/examples/sensors/maze/LabyrinthSquare.qml
index e5aacfcd..e5aacfcd 100644
--- a/examples/QtSensors/QtSensors_maze/LabyrinthSquare.qml
+++ b/examples/sensors/maze/LabyrinthSquare.qml
diff --git a/examples/QtSensors/QtSensors_maze/Mouse.qml b/examples/sensors/maze/Mouse.qml
index 434acebb..434acebb 100644
--- a/examples/QtSensors/QtSensors_maze/Mouse.qml
+++ b/examples/sensors/maze/Mouse.qml
diff --git a/examples/QtSensors/QtSensors_maze/components/ApplicationWindow.qml b/examples/sensors/maze/components/ApplicationWindow.qml
index cab5e94c..cab5e94c 100644
--- a/examples/QtSensors/QtSensors_maze/components/ApplicationWindow.qml
+++ b/examples/sensors/maze/components/ApplicationWindow.qml
diff --git a/examples/QtSensors/QtSensors_maze/components/Button.qml b/examples/sensors/maze/components/Button.qml
index 537a8bce..537a8bce 100644
--- a/examples/QtSensors/QtSensors_maze/components/Button.qml
+++ b/examples/sensors/maze/components/Button.qml
diff --git a/examples/QtSensors/QtSensors_maze/components/images/button_background_disabled.png b/examples/sensors/maze/components/images/button_background_disabled.png
index 62a00b9a..62a00b9a 100644
--- a/examples/QtSensors/QtSensors_maze/components/images/button_background_disabled.png
+++ b/examples/sensors/maze/components/images/button_background_disabled.png
diff --git a/examples/QtSensors/QtSensors_maze/components/images/button_background_normal.png b/examples/sensors/maze/components/images/button_background_normal.png
index 1fecad5b..1fecad5b 100644
--- a/examples/QtSensors/QtSensors_maze/components/images/button_background_normal.png
+++ b/examples/sensors/maze/components/images/button_background_normal.png
diff --git a/examples/QtSensors/QtSensors_maze/components/images/button_background_pressed.png b/examples/sensors/maze/components/images/button_background_pressed.png
index 149529e1..149529e1 100644
--- a/examples/QtSensors/QtSensors_maze/components/images/button_background_pressed.png
+++ b/examples/sensors/maze/components/images/button_background_pressed.png
diff --git a/examples/QtSensors/QtSensors_maze/content/00.png b/examples/sensors/maze/content/00.png
index ab29a622..ab29a622 100644
--- a/examples/QtSensors/QtSensors_maze/content/00.png
+++ b/examples/sensors/maze/content/00.png
diff --git a/examples/QtSensors/QtSensors_maze/content/01.png b/examples/sensors/maze/content/01.png
index 0e70d1b2..0e70d1b2 100644
--- a/examples/QtSensors/QtSensors_maze/content/01.png
+++ b/examples/sensors/maze/content/01.png
diff --git a/examples/QtSensors/QtSensors_maze/content/cheese.png b/examples/sensors/maze/content/cheese.png
index ecef4503..ecef4503 100644
--- a/examples/QtSensors/QtSensors_maze/content/cheese.png
+++ b/examples/sensors/maze/content/cheese.png
diff --git a/examples/QtSensors/QtSensors_maze/content/cheeseeating.gif b/examples/sensors/maze/content/cheeseeating.gif
index 6b2cb47f..6b2cb47f 100644
--- a/examples/QtSensors/QtSensors_maze/content/cheeseeating.gif
+++ b/examples/sensors/maze/content/cheeseeating.gif
diff --git a/examples/QtSensors/QtSensors_maze/content/congratulations.gif b/examples/sensors/maze/content/congratulations.gif
index 70204176..70204176 100644
--- a/examples/QtSensors/QtSensors_maze/content/congratulations.gif
+++ b/examples/sensors/maze/content/congratulations.gif
diff --git a/examples/QtSensors/QtSensors_maze/content/mouse_down.gif b/examples/sensors/maze/content/mouse_down.gif
index 5491c18f..5491c18f 100644
--- a/examples/QtSensors/QtSensors_maze/content/mouse_down.gif
+++ b/examples/sensors/maze/content/mouse_down.gif
diff --git a/examples/QtSensors/QtSensors_maze/content/start.png b/examples/sensors/maze/content/start.png
index 698c0b1c..698c0b1c 100644
--- a/examples/QtSensors/QtSensors_maze/content/start.png
+++ b/examples/sensors/maze/content/start.png
diff --git a/examples/QtSensors/QtSensors_maze/icon.png b/examples/sensors/maze/icon.png
index 1e7ff8d8..1e7ff8d8 100644
--- a/examples/QtSensors/QtSensors_maze/icon.png
+++ b/examples/sensors/maze/icon.png
diff --git a/examples/QtSensors/QtSensors_maze/info.json b/examples/sensors/maze/info.json
index 8e2ad1a8..8e2ad1a8 100644
--- a/examples/QtSensors/QtSensors_maze/info.json
+++ b/examples/sensors/maze/info.json
diff --git a/examples/QtSensors/QtSensors_maze/lib.js b/examples/sensors/maze/lib.js
index 3bae6a86..3bae6a86 100644
--- a/examples/QtSensors/QtSensors_maze/lib.js
+++ b/examples/sensors/maze/lib.js
diff --git a/examples/QtSensors/QtSensors_maze/QtSensors_maze.pro b/examples/sensors/maze/maze.pro
index a15e39ef..a15e39ef 100644
--- a/examples/QtSensors/QtSensors_maze/QtSensors_maze.pro
+++ b/examples/sensors/maze/maze.pro
diff --git a/examples/QtSensors/QtSensors_maze/QtSensors_maze.qml b/examples/sensors/maze/maze.qml
index 40c1d1dd..40c1d1dd 100644
--- a/examples/QtSensors/QtSensors_maze/QtSensors_maze.qml
+++ b/examples/sensors/maze/maze.qml
diff --git a/examples/QtSensors/QtSensors_maze/qml.pro b/examples/sensors/maze/qml.pro
index 95fbb65e..95fbb65e 100644
--- a/examples/QtSensors/QtSensors_maze/qml.pro
+++ b/examples/sensors/maze/qml.pro
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/components/ApplicationWindow.qml b/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml
index cab5e94c..cab5e94c 100644
--- a/examples/QtSensors/QtSensors_qmlqtsensors/components/ApplicationWindow.qml
+++ b/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/components/Button.qml b/examples/sensors/qmlqtsensors/components/Button.qml
index 537a8bce..537a8bce 100644
--- a/examples/QtSensors/QtSensors_qmlqtsensors/components/Button.qml
+++ b/examples/sensors/qmlqtsensors/components/Button.qml
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_disabled.png b/examples/sensors/qmlqtsensors/components/images/button_background_disabled.png
index 62a00b9a..62a00b9a 100644
--- a/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_disabled.png
+++ b/examples/sensors/qmlqtsensors/components/images/button_background_disabled.png
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_normal.png b/examples/sensors/qmlqtsensors/components/images/button_background_normal.png
index 1fecad5b..1fecad5b 100644
--- a/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_normal.png
+++ b/examples/sensors/qmlqtsensors/components/images/button_background_normal.png
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_pressed.png b/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png
index 149529e1..149529e1 100644
--- a/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_pressed.png
+++ b/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/icon.png b/examples/sensors/qmlqtsensors/icon.png
index d3243c5b..d3243c5b 100644
--- a/examples/QtSensors/QtSensors_qmlqtsensors/icon.png
+++ b/examples/sensors/qmlqtsensors/icon.png
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/info.json b/examples/sensors/qmlqtsensors/info.json
index e5484028..e5484028 100644
--- a/examples/QtSensors/QtSensors_qmlqtsensors/info.json
+++ b/examples/sensors/qmlqtsensors/info.json
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/qml.pro b/examples/sensors/qmlqtsensors/qml.pro
index 741070ff..741070ff 100644
--- a/examples/QtSensors/QtSensors_qmlqtsensors/qml.pro
+++ b/examples/sensors/qmlqtsensors/qml.pro
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.pro b/examples/sensors/qmlqtsensors/qmlqtsensors.pro
index a15e39ef..a15e39ef 100644
--- a/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.pro
+++ b/examples/sensors/qmlqtsensors/qmlqtsensors.pro
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml b/examples/sensors/qmlqtsensors/qmlqtsensors.qml
index 44be63aa..44be63aa 100644
--- a/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml
+++ b/examples/sensors/qmlqtsensors/qmlqtsensors.qml
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/Button.qml b/examples/sensors/qmlsensorgestures/Button.qml
index 23fc0f66..23fc0f66 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/Button.qml
+++ b/examples/sensors/qmlsensorgestures/Button.qml
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/GestureList.qml b/examples/sensors/qmlsensorgestures/GestureList.qml
index 9dc3fd92..9dc3fd92 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/GestureList.qml
+++ b/examples/sensors/qmlsensorgestures/GestureList.qml
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml b/examples/sensors/qmlsensorgestures/GestureView.qml
index 07a9a5cc..07a9a5cc 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml
+++ b/examples/sensors/qmlsensorgestures/GestureView.qml
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/GesturesView.qml b/examples/sensors/qmlsensorgestures/GesturesView.qml
index 23924cad..23924cad 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/GesturesView.qml
+++ b/examples/sensors/qmlsensorgestures/GesturesView.qml
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/icon.png b/examples/sensors/qmlsensorgestures/icon.png
index c445bd7f..c445bd7f 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/icon.png
+++ b/examples/sensors/qmlsensorgestures/icon.png
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/info.json b/examples/sensors/qmlsensorgestures/info.json
index 57241dab..57241dab 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/info.json
+++ b/examples/sensors/qmlsensorgestures/info.json
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.json b/examples/sensors/qmlsensorgestures/plugin/plugin.json
index 8a55b3ae..8a55b3ae 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.json
+++ b/examples/sensors/qmlsensorgestures/plugin/plugin.json
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.pro b/examples/sensors/qmlsensorgestures/plugin/plugin.pro
index 2003e910..2003e910 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.pro
+++ b/examples/sensors/qmlsensorgestures/plugin/plugin.pro
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.cpp b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp
index 1fda1879..1fda1879 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.cpp
+++ b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.h b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h
index 4755f96e..4755f96e 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.h
+++ b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.cpp b/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp
index 03319e81..03319e81 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.cpp
+++ b/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.h b/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h
index 37c16eb1..37c16eb1 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.h
+++ b/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro b/examples/sensors/qmlsensorgestures/qml.pro
index 333f251c..333f251c 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro
+++ b/examples/sensors/qmlsensorgestures/qml.pro
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.pro b/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro
index 011f5f95..011f5f95 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.pro
+++ b/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.qml b/examples/sensors/qmlsensorgestures/qmlsensorgestures.qml
index 5a7a4e20..5a7a4e20 100644
--- a/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.qml
+++ b/examples/sensors/qmlsensorgestures/qmlsensorgestures.qml
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/PropertyList.qml b/examples/sensors/sensor_explorer/PropertyList.qml
index 846c4cca..846c4cca 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/PropertyList.qml
+++ b/examples/sensors/sensor_explorer/PropertyList.qml
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/SensorList.qml b/examples/sensors/sensor_explorer/SensorList.qml
index da157378..da157378 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/SensorList.qml
+++ b/examples/sensors/sensor_explorer/SensorList.qml
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/components/ApplicationWindow.qml b/examples/sensors/sensor_explorer/components/ApplicationWindow.qml
index cab5e94c..cab5e94c 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/components/ApplicationWindow.qml
+++ b/examples/sensors/sensor_explorer/components/ApplicationWindow.qml
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/components/Button.qml b/examples/sensors/sensor_explorer/components/Button.qml
index 537a8bce..537a8bce 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/components/Button.qml
+++ b/examples/sensors/sensor_explorer/components/Button.qml
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/components/TextField.qml b/examples/sensors/sensor_explorer/components/TextField.qml
index c1feaf21..c1feaf21 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/components/TextField.qml
+++ b/examples/sensors/sensor_explorer/components/TextField.qml
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_disabled.png b/examples/sensors/sensor_explorer/components/images/button_background_disabled.png
index 62a00b9a..62a00b9a 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_disabled.png
+++ b/examples/sensors/sensor_explorer/components/images/button_background_disabled.png
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_normal.png b/examples/sensors/sensor_explorer/components/images/button_background_normal.png
index 1fecad5b..1fecad5b 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_normal.png
+++ b/examples/sensors/sensor_explorer/components/images/button_background_normal.png
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_pressed.png b/examples/sensors/sensor_explorer/components/images/button_background_pressed.png
index 149529e1..149529e1 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_pressed.png
+++ b/examples/sensors/sensor_explorer/components/images/button_background_pressed.png
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_disabled.png b/examples/sensors/sensor_explorer/components/images/textfield_background_disabled.png
index 98bc601f..98bc601f 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_disabled.png
+++ b/examples/sensors/sensor_explorer/components/images/textfield_background_disabled.png
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_normal.png b/examples/sensors/sensor_explorer/components/images/textfield_background_normal.png
index b90b50cd..b90b50cd 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_normal.png
+++ b/examples/sensors/sensor_explorer/components/images/textfield_background_normal.png
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/content/listitem_select.png b/examples/sensors/sensor_explorer/content/listitem_select.png
index def234f1..def234f1 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/content/listitem_select.png
+++ b/examples/sensors/sensor_explorer/content/listitem_select.png
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/icon.png b/examples/sensors/sensor_explorer/icon.png
index c48b6095..c48b6095 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/icon.png
+++ b/examples/sensors/sensor_explorer/icon.png
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp b/examples/sensors/sensor_explorer/import/explorer.cpp
index 12b35f9e..12b35f9e 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp
+++ b/examples/sensors/sensor_explorer/import/explorer.cpp
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.h b/examples/sensors/sensor_explorer/import/explorer.h
index eaac8104..eaac8104 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.h
+++ b/examples/sensors/sensor_explorer/import/explorer.h
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro
index 1f97b67e..1f97b67e 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/import.pro
+++ b/examples/sensors/sensor_explorer/import/import.pro
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/main.cpp b/examples/sensors/sensor_explorer/import/main.cpp
index 80e2510d..80e2510d 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/main.cpp
+++ b/examples/sensors/sensor_explorer/import/main.cpp
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/plugin.json b/examples/sensors/sensor_explorer/import/plugin.json
index 0967ef42..0967ef42 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/plugin.json
+++ b/examples/sensors/sensor_explorer/import/plugin.json
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp b/examples/sensors/sensor_explorer/import/propertyinfo.cpp
index 00f43e44..00f43e44 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp
+++ b/examples/sensors/sensor_explorer/import/propertyinfo.cpp
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.h b/examples/sensors/sensor_explorer/import/propertyinfo.h
index b3ebe4c0..b3ebe4c0 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.h
+++ b/examples/sensors/sensor_explorer/import/propertyinfo.h
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/qmldir b/examples/sensors/sensor_explorer/import/qmldir
index 60d8f883..60d8f883 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/qmldir
+++ b/examples/sensors/sensor_explorer/import/qmldir
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp b/examples/sensors/sensor_explorer/import/sensoritem.cpp
index dd9d0365..dd9d0365 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp
+++ b/examples/sensors/sensor_explorer/import/sensoritem.cpp
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.h b/examples/sensors/sensor_explorer/import/sensoritem.h
index b937687f..b937687f 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.h
+++ b/examples/sensors/sensor_explorer/import/sensoritem.h
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/info.json b/examples/sensors/sensor_explorer/info.json
index 18f3e8d5..18f3e8d5 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/info.json
+++ b/examples/sensors/sensor_explorer/info.json
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/qml.pro b/examples/sensors/sensor_explorer/qml.pro
index fae3705d..fae3705d 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/qml.pro
+++ b/examples/sensors/sensor_explorer/qml.pro
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.pro b/examples/sensors/sensor_explorer/sensor_explorer.pro
index 85ba45ef..85ba45ef 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.pro
+++ b/examples/sensors/sensor_explorer/sensor_explorer.pro
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml b/examples/sensors/sensor_explorer/sensor_explorer.qml
index 88641604..88641604 100644
--- a/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml
+++ b/examples/sensors/sensor_explorer/sensor_explorer.qml
diff --git a/examples/QtSensors/QtSensors_sensorgestures/gesture.png b/examples/sensors/sensorgestures/gesture.png
index 707d5c4e..707d5c4e 100644
--- a/examples/QtSensors/QtSensors_sensorgestures/gesture.png
+++ b/examples/sensors/sensorgestures/gesture.png
diff --git a/examples/QtSensors/QtSensors_sensorgestures/main.cpp b/examples/sensors/sensorgestures/main.cpp
index 49594d4e..49594d4e 100644
--- a/examples/QtSensors/QtSensors_sensorgestures/main.cpp
+++ b/examples/sensors/sensorgestures/main.cpp
diff --git a/examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp b/examples/sensors/sensorgestures/mainwindow.cpp
index 9dd8a611..9dd8a611 100644
--- a/examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp
+++ b/examples/sensors/sensorgestures/mainwindow.cpp
diff --git a/examples/QtSensors/QtSensors_sensorgestures/mainwindow.h b/examples/sensors/sensorgestures/mainwindow.h
index 1e38f1be..1e38f1be 100644
--- a/examples/QtSensors/QtSensors_sensorgestures/mainwindow.h
+++ b/examples/sensors/sensorgestures/mainwindow.h
diff --git a/examples/QtSensors/QtSensors_sensorgestures/mainwindow.ui b/examples/sensors/sensorgestures/mainwindow.ui
index baccf98c..baccf98c 100644
--- a/examples/QtSensors/QtSensors_sensorgestures/mainwindow.ui
+++ b/examples/sensors/sensorgestures/mainwindow.ui
diff --git a/examples/QtSensors/QtSensors_sensorgestures/QtSensors_sensorgestures.pro b/examples/sensors/sensorgestures/sensorgestures.pro
index 295db944..295db944 100644
--- a/examples/QtSensors/QtSensors_sensorgestures/QtSensors_sensorgestures.pro
+++ b/examples/sensors/sensorgestures/sensorgestures.pro
diff --git a/examples/sensors/sensors.pro b/examples/sensors/sensors.pro
new file mode 100644
index 00000000..f865ece5
--- /dev/null
+++ b/examples/sensors/sensors.pro
@@ -0,0 +1,16 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    accel \
+    accelbubble \
+    cubehouse \
+    grue \
+    qmlsensorgestures \
+    maze \
+    qmlqtsensors \
+    sensor_explorer \
+    shakeit
+
+!isEmpty(QT.widgets.name):SUBDIRS += \
+    sensorgestures
+
diff --git a/examples/QtSensors/QtSensors_shakeit/audio/loopy2a_mono.wav b/examples/sensors/shakeit/audio/loopy2a_mono.wav
index 7d76cb65..7d76cb65 100644
--- a/examples/QtSensors/QtSensors_shakeit/audio/loopy2a_mono.wav
+++ b/examples/sensors/shakeit/audio/loopy2a_mono.wav
diff --git a/examples/QtSensors/QtSensors_shakeit/audio/phone.wav b/examples/sensors/shakeit/audio/phone.wav
index 884e9ac2..884e9ac2 100644
--- a/examples/QtSensors/QtSensors_shakeit/audio/phone.wav
+++ b/examples/sensors/shakeit/audio/phone.wav
diff --git a/examples/QtSensors/QtSensors_shakeit/content/triangle.png b/examples/sensors/shakeit/content/triangle.png
index f366537e..f366537e 100644
--- a/examples/QtSensors/QtSensors_shakeit/content/triangle.png
+++ b/examples/sensors/shakeit/content/triangle.png
diff --git a/examples/QtSensors/QtSensors_shakeit/content/triangle2.png b/examples/sensors/shakeit/content/triangle2.png
index 9318d5a3..9318d5a3 100644
--- a/examples/QtSensors/QtSensors_shakeit/content/triangle2.png
+++ b/examples/sensors/shakeit/content/triangle2.png
diff --git a/examples/QtSensors/QtSensors_shakeit/content/triangle3.png b/examples/sensors/shakeit/content/triangle3.png
index 4cc5ccda..4cc5ccda 100644
--- a/examples/QtSensors/QtSensors_shakeit/content/triangle3.png
+++ b/examples/sensors/shakeit/content/triangle3.png
diff --git a/examples/QtSensors/QtSensors_shakeit/icon.png b/examples/sensors/shakeit/icon.png
index d8f21546..d8f21546 100644
--- a/examples/QtSensors/QtSensors_shakeit/icon.png
+++ b/examples/sensors/shakeit/icon.png
diff --git a/examples/QtSensors/QtSensors_shakeit/info.json b/examples/sensors/shakeit/info.json
index a98f6f2b..a98f6f2b 100644
--- a/examples/QtSensors/QtSensors_shakeit/info.json
+++ b/examples/sensors/shakeit/info.json
diff --git a/examples/QtSensors/QtSensors_shakeit/qml.pro b/examples/sensors/shakeit/qml.pro
index 1265d8e9..1265d8e9 100644
--- a/examples/QtSensors/QtSensors_shakeit/qml.pro
+++ b/examples/sensors/shakeit/qml.pro
diff --git a/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.pro b/examples/sensors/shakeit/shakeit.pro
index 6dc685b9..6dc685b9 100644
--- a/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.pro
+++ b/examples/sensors/shakeit/shakeit.pro
diff --git a/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml b/examples/sensors/shakeit/shakeit.qml
index 3b3b1f5c..3b3b1f5c 100644
--- a/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml
+++ b/examples/sensors/shakeit/shakeit.qml