1 files changed, 17 insertions, 66 deletions
diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc
index 84309d6..66ad73c 100644
--- a/doc/b2qt-demos.qdoc
+++ b/doc/b2qt-demos.qdoc
@@ -32,7 +32,7 @@
 */
 
 /*!
-    \example about-b2qt
+    \example basicsuite/about-b2qt
     \title About Qt for Device Creation
     \ingroup b2qt-demos
     \brief Displays information about Qt for Device Creation.
@@ -43,7 +43,7 @@
 */
 
 /*!
-    \example camera
+    \example basicsuite/camera
     \title Camera
     \ingroup b2qt-demos
     \brief Demonstrates using camera in a QML application.
@@ -61,22 +61,7 @@
 */
 
 /*!
-    \example controls-touch
-    \title Controls Touch
-    \ingroup b2qt-demos
-    \brief Demonstrates a touch UI implemented with Qt Quick Controls.
-
-    \image b2qt-demo-controls-touch.jpg
-
-    The purpose of this example is to show Qt Quick Controls in practice. The example uses a
-    StackView to navigate between pages and illustrates the use of many of the controls provided
-    by Qt Quick Control, including Button, Slider, ProgressBar, TabBar and TextInput types. The
-    style in the example is a custom style made to look like the Android theme, it is written
-    purely in QML.
-*/
-
-/*!
-    \example graphicaleffects
+    \example basicsuite/graphicaleffects
     \title Graphical Effects
     \ingroup b2qt-demos
     \brief Demonstrates the different graphical effects that can be used in a QML application.
@@ -91,7 +76,7 @@
 */
 
 /*!
-    \example mediaplayer
+    \example basicsuite/mediaplayer
     \title Media Player
     \ingroup b2qt-demos
     \brief A media player implemented in QML.
@@ -104,12 +89,12 @@
 */
 
 /*!
-    \example canvas3d-planets
+    \example basicsuite/canvas3d-planets
     \title Qt Canvas3D Planets
     \ingroup b2qt-demos
     \brief Demonstrates the usage of Qt Canvas 3D, a WebGL-like API for QML, and popular JavaScript frameworks like three.js.
 
-    \image b2qt-demo-planets.jpg
+    \image b2qt-demo-canvas3d-planets.jpg
 
     The demo uses Qt Quick and Canvas 3D in combination with \l{http://threejs.org/}{three.js},
     \l{https://github.com/jeromeetienne/threex.planets}{threex.planets}, and Qt Quick
@@ -119,7 +104,7 @@
 */
 
 /*!
-    \example qt5-cinematicdemo
+    \example basicsuite/qt5-cinematicdemo
     \title Qt 5 Cinematic Demo
     \ingroup b2qt-demos
     \brief A cool demonstration of the graphical prowess of Qt 5 and Qt Quick 2.
@@ -138,34 +123,7 @@
 */
 
 /*!
-    \example qt5-everywhere
-    \title Qt 5 Everywhere
-    \ingroup b2qt-demos
-    \brief Highlights the versatility and cross-platform capability of Qt
-
-    \image b2qt-demo-qt5-everywhere.jpg
-
-    The Qt 5 Everywhere demo shows how to use different user interface styles in several platforms
-    and device types with one source code.
-
-    The demo contains several Qt Quick 2 applications which you can launch by tapping the devices.
-*/
-
-/*!
-    \example sensors
-    \title Sensors
-    \ingroup b2qt-demos
-    \brief Demonstrates using the accelerometer and light sensors in a QML application.
-
-    \image b2qt-demo-sensors.jpg
-
-    Tilting the device moves the bubble around, based on readings from the accelerometer sensor.
-    For the light sensor, exposing the device to different lighting conditions changes the
-    displayed image.
-*/
-
-/*!
-    \example textinput
+    \example basicsuite/textinput
     \title Text Input
     \ingroup b2qt-demos
     \brief Demonstrates text input capabilities and the virtual keyboard in a QML application.
@@ -180,7 +138,7 @@
 */
 
 /*!
-    \example enterprise-charts
+    \example basicsuite/enterprise-charts
     \title Charts
     \ingroup b2qt-demos
     \brief Showcases the different types of charts available from the Qt Charts library.
@@ -192,7 +150,7 @@
 */
 
 /*!
-    \example enterprise-dashboard
+    \example basicsuite/enterprise-dashboard
     \title Dashboard
     \ingroup b2qt-demos
     \brief A car dashboard created using Qt Quick Enterprise Controls.
@@ -203,7 +161,7 @@
 */
 
 /*!
-    \example enterprise-qtdatavis3d
+    \example basicsuite/enterprise-qtdatavis3d
     \title Qt Data Visualization
     \ingroup b2qt-demos
     \brief An interactive showcase for Qt Data Visualization 3D.
@@ -214,7 +172,7 @@
 */
 
 /*!
-    \example enterprise-gallery
+    \example basicsuite/enterprise-gallery
     \title Enterprise Controls Gallery
     \ingroup b2qt-demos
     \brief An interactive showcase for Qt Quick Enterprise Controls.
@@ -225,7 +183,7 @@
 */
 
 /*!
-    \example enterprise-flat-controls
+    \example basicsuite/enterprise-flat-controls
     \title Enterprise Flat Controls
     \ingroup b2qt-demos
     \brief The Flat Style Gallery example showcases the Qt Quick Controls.
@@ -238,20 +196,13 @@
 */
 
 /*!
-    \example launchersettings
-    \title Launcher Settings
-    \ingroup b2qt-demos
-    \brief Displays information and settings available for the Boot to Qt launcher.
-*/
-
-/*!
-    \example webengine
-    \title Qt WebEngine Browser Demo
+    \example basicsuite/qtwebbrowser
+    \title Qt Web Browser Demo
     \ingroup b2qt-demos
     \brief This example demonstrates the use of the QtWebEngine WebView with Qt Quick.
 
-    \image b2qt-demo-webengine.jpg
+    \image b2qt-demo-qtwebbrowser.jpg
 
     The example can be used to browse the internet (working network connection
-    required) or run the off-line WebGL demo.
+    required).
 */