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

* origin/5.6:
  change button background color from white to black
  change about-b2qt background to white
  doc: update demos used in docs
  export wayland demo
  Update qtwebbrowser submodule to fix keyboard issue
  Added audio formats to mediaplayer's file filters.
  Replace title, description and exclude files with one demos.xml

Change-Id: Ia7a617e728e25c53ab112c4e3dec0bac1996af42

12 files changed, 20 insertions, 73 deletions

diff --git a/.export b/.export
index a8d1f44..b3c5721 100644
--- a/.export
+++ b/.export
@@ -1 +1,2 @@
 basicsuite
+wayland
diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser
-Subproject 60a8ef724c11c35413d42ef1ccd118e9c4f6c3c
+Subproject c86bb8a400f79be205025598310926df5d01c7b
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).
 */
diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf
index dde8219..a5612b9 100644
--- a/doc/b2qt-demos.qdocconf
+++ b/doc/b2qt-demos.qdocconf
@@ -16,7 +16,7 @@ sources.fileextensions       = "*.qdoc"
 examples.fileextensions      = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
 examples.imageextensions     = "*.png *.jpg *.gif"
 
-exampledirs                  = ../basicsuite
+exampledirs                  = ..
 
 qhp.projects                 = QtforDeviceCreationDemos
 
diff --git a/doc/images/b2qt-demo-planets.jpg b/doc/images/b2qt-demo-canvas3d-planets.jpg
index 8c8b33e..8c8b33e 120000
--- a/doc/images/b2qt-demo-planets.jpg
+++ b/doc/images/b2qt-demo-canvas3d-planets.jpg
diff --git a/doc/images/b2qt-demo-controls-touch.jpg b/doc/images/b2qt-demo-controls-touch.jpg
deleted file mode 120000
index bd78fcf..0000000
--- a/doc/images/b2qt-demo-controls-touch.jpg
+++ /dev/null
@@ -1 +0,0 @@
-../../basicsuite/controls-touch/preview_l.jpg
\ No newline at end of file
diff --git a/doc/images/b2qt-demo-qt5-everywhere.jpg b/doc/images/b2qt-demo-qt5-everywhere.jpg
deleted file mode 120000
index 0c61cdb..0000000
--- a/doc/images/b2qt-demo-qt5-everywhere.jpg
+++ /dev/null
@@ -1 +0,0 @@
-../../basicsuite/qt5-everywhere/preview_l.jpg
\ No newline at end of file
diff --git a/doc/images/b2qt-demo-qt5-particlesdemo.jpg b/doc/images/b2qt-demo-qt5-particlesdemo.jpg
deleted file mode 120000
index 42553b8..0000000
--- a/doc/images/b2qt-demo-qt5-particlesdemo.jpg
+++ /dev/null
@@ -1 +0,0 @@
-../../basicsuite/qt5-particlesdemo/preview_l.jpg
\ No newline at end of file
diff --git a/doc/images/b2qt-demo-qtwebbrowser.jpg b/doc/images/b2qt-demo-qtwebbrowser.jpg
new file mode 120000
index 0000000..13dea2f
--- /dev/null
+++ b/doc/images/b2qt-demo-qtwebbrowser.jpg
@@ -0,0 +1 @@
+../../basicsuite/qtwebbrowser/preview_l.jpg
\ No newline at end of file
diff --git a/doc/images/b2qt-demo-sensorexplorer.jpg b/doc/images/b2qt-demo-sensorexplorer.jpg
deleted file mode 120000
index 4c2797f..0000000
--- a/doc/images/b2qt-demo-sensorexplorer.jpg
+++ /dev/null
@@ -1 +0,0 @@
-../../basicsuite/sensorexplorer/preview_l.jpg
\ No newline at end of file
diff --git a/doc/images/b2qt-demo-sensors.jpg b/doc/images/b2qt-demo-sensors.jpg
deleted file mode 120000
index 4144c1c..0000000
--- a/doc/images/b2qt-demo-sensors.jpg
+++ /dev/null
@@ -1 +0,0 @@
-../../basicsuite/sensors/preview_l.jpg
\ No newline at end of file
diff --git a/doc/images/b2qt-demo-webengine.jpg b/doc/images/b2qt-demo-webengine.jpg
deleted file mode 120000
index 5d319d8..0000000
--- a/doc/images/b2qt-demo-webengine.jpg
+++ /dev/null
@@ -1 +0,0 @@
-../../basicsuite/webengine/preview_l.jpg
\ No newline at end of file