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

* origin/5.11:

1ff81b4 Merge remote-tracking branch 'origin/5.9' into 5.11
3594ea2 Fix scaling, video path & focusing issues on mediaplayer demo
e81384c Remove confusing highlighting on media player file browser
4aa85d7 Use QSettings for color definitions
a60eb67 Disable graphical effect from imx7 boards
83bffe9 Move color definitions to QSettings
57bc95f Fix qtquickcontrols2 demo image paths & controls theme
a5ba671 Doc: Bump version to 5.11.2
1510d96 Doc: bump version to 5.9.7
cc9de37 Fix mediaplayer slider color definitions
c20966f Move info button to mediaplayer-demo footer
0b0d77e Fix mediaplayer color definitions
a607978 Update Boot2Qt Launcher demo icons & doc images
773a661 Disable webbrowser demo from all imx7 boards
9f18bb7 Doc: Bump version to 5.11.1
4fa8854 Doc: remove outdate doc folder under qtquickcontrols2 example
054a2ea doc: add missing doc images for e-bike & quickcontrols2 demo
173d934 Update Boot2Qt demos appearing in QtCreator
a70868f Enable ebike demo
6ed3d30 Temporarily disable e-bike from the basicsuite demo set
28e9fdf Fix Media Player demo color definitions
6b5a6d0 Fix paths for demos.xml
783ca94 Doc: bump version to 5.9.6
d083365 Add new Ebike demo to basicsuite
da60352 Move common definitions to shared settings
e513aed Update QtWebBrowser demo to new UI theme
f5c4c3a Remove qtwebbrowser submodule
3fa5796 Replace existing controls demos with controls 2 gallery example
04e4798 Update Mediaplayer demo to new UI theme
2e8942f Update GraphicalEffects demo to new UI theme
e365074 Add new fonts
7c41444 Update Charts demo to new UI theme
2a50d49 Comment out 7 demos from demos.xml file
9e941af Doc: Bump version to 5.9.5
0909f9b Doc: Bump version to 5.11.0
55fee3b Doc: Bump version to 5.9.4
89033ce Doc: Bump version to 5.9.3

Change-Id: I17ac5f2e2ef94535458b07cf8db38688e25ca21c

8 files changed, 22 insertions, 101 deletions

diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc
index 1a14796..687e374 100644
--- a/doc/b2qt-demos.qdoc
+++ b/doc/b2qt-demos.qdoc
@@ -50,7 +50,7 @@
 
 /*!
     \page index.html
-    \title Qt 5.10.1 for Device Creation Examples and Demos
+    \title Qt 5.11.2 for Device Creation Examples and Demos
 
     \SDK has a number of examples and demos. These are included in the
     \B2Q images, available in the launcher that is run by default at
@@ -63,32 +63,20 @@
 */
 
 /*!
-    \example basicsuite/about-b2qt
-    \title About Qt for Device Creation
+    \example basicsuite/ebike-ui
+    \title e-bike Demo
     \ingroup b2qt-demos
-    \brief Displays information about Qt for Device Creation.
+    \brief An E-bike instrument cluster concept.
 
-    \image b2qt-demo-about-b2qt.jpg
+    \image b2qt-demo-ebike-ui.jpg
 
-    A demo that provides an introduction to what Qt for Device Creation is all about.
-*/
-
-/*!
-    \example basicsuite/camera
-    \title Camera
-    \ingroup b2qt-demos
-    \brief Demonstrates using camera in a QML application.
-
-    \image b2qt-demo-camera.jpg
+    An E-bike instrument cluster concept designed and implemented by Qt.
 
-    This example demonstrates the use of the camera features provided by Qt Multimedia with
-    Qt Quick.
-
-    Demo can be used to take pictures. Files are saved inside the \c {/data/images/} folder
-    and can be then viewed with the \l {Photo Gallery} demo application.
+    The entire concept is a testament that Qt brings the HMI designers and Software engineers together
+    by using the same tools, allowing them to fast prototyping through collaborative workflow.
+    In addition to that, Qt is optimized for running on low end SoC even the ones that don't have GPU acceleration
+    for graphics.
 
-    Camera parameters such as flash mode, scene mode or white balance can be changed. The
-    availability of parameters depends on what the camera driver provides.
 */
 
 /*!
@@ -120,40 +108,6 @@
 */
 
 /*!
-    \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-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
-    Controls. Tapping on a planet changes the view and moves to the chosen planet. Use the sliders
-    to adjust the zoom levels and viewing distance. Tapping outside the controls moves the focus
-    back to the solar view.
-*/
-
-/*!
-    \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.
-
-    \image b2qt-demo-qt5-cinematicdemo.jpg
-
-    The Qt5 Cinematic Experience is a demo by "QUIt Coding", a small group of talented individuals
-    enjoying software development with cutting edge technologies. They are official members of the
-    Qt Ambassador Program.
-
-    The demo shows off a number features of Qt Quick 2.0. A nicely styled list control of movie
-    covers with lighting effects, particles and transitions. The information roll-down curvy
-    curtain is implemented using inline GLSL in the QML file.
-
-    More awesome looking Qt Quick examples are available from \l {http://quitcoding.com}.
-*/
-
-/*!
     \example basicsuite/textinput
     \title Text Input
     \ingroup b2qt-demos
@@ -181,49 +135,16 @@
 */
 
 /*!
-    \example basicsuite/enterprise-dashboard
-    \title Dashboard
-    \ingroup b2qt-demos
-    \brief A car dashboard created using Qt Quick Enterprise Controls.
-
-    \image b2qt-demo-enterprise-dashboard.jpg
-
-    This example project demonstrates using several CircularGauge controls to create a car dashboard.
-*/
-
-/*!
-    \example basicsuite/enterprise-qtdatavis3d
-    \title Qt Data Visualization
-    \ingroup b2qt-demos
-    \brief An interactive showcase for Qt Data Visualization 3D.
-
-    \image b2qt-demo-enterprise-qtdatavis3d.jpg
-
-    This example demonstrates how to use the Qt Data Visualization module to display 3D data visualizations in QML.
-*/
-
-/*!
-    \example basicsuite/enterprise-gallery
-    \title Enterprise Controls Gallery
-    \ingroup b2qt-demos
-    \brief An interactive showcase for Qt Quick Enterprise Controls.
-
-    \image b2qt-demo-enterprise-gallery.jpg
-
-    This example project demonstrates the various UI controls provided by Qt Quick Enterprise Controls.
-*/
-
-/*!
-    \example basicsuite/enterprise-flat-controls
-    \title Enterprise Flat Controls
+    \example basicsuite/qtquickcontrols2
+    \title Qt Quick Controls 2 - Gallery
     \ingroup b2qt-demos
-    \brief The Flat Style Gallery example showcases the Qt Quick Controls.
+    \brief  A gallery of controls.
 
-    \image b2qt-demo-enterprise-flat-controls.jpg
+    \image b2qt-demo-qtquickcontrols2.jpg
 
-    This demo combines both the standard Quick Controls as well as the Qt Quick Enterprise Controls
-    both of which are using the new Flat style. The Flat style for Qt Quick Controls has a modern
-    look and feel and is perfect for the touch driven interfaces commonly developed by device creators.
+    The gallery example is a simple application with a drawer menu that contains all the Qt Quick Controls 2. Each
+    menu item opens a page that shows the graphical appearance of a control, allows you to interact with the control,
+    and explains in which circumstances it is handy to use this control.
 */
 
 /*!
diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf
index 51931cb..907f639 100644
--- a/doc/b2qt-demos.qdocconf
+++ b/doc/b2qt-demos.qdocconf
@@ -5,8 +5,8 @@ outputencoding               = UTF-8
 sourceencoding               = UTF-8
 
 project                      = QtforDeviceCreationDemos
-description                  = Qt 5.10.1 for Device Creation Examples and Demos
-version                      = 5.10.1
+description                  = Qt 5.11.2 for Device Creation Examples and Demos
+version                      = 5.11.2
 
 sourcedirs                   = .
 imagedirs                   += images
@@ -21,9 +21,9 @@ exampledirs                  = ..
 qhp.projects                 = QtforDeviceCreationDemos
 
 qhp.QtforDeviceCreationDemos.file                = b2qt-demos.qhp
-qhp.QtforDeviceCreationDemos.namespace           = org.qt-project.b2qt-demos.5101
+qhp.QtforDeviceCreationDemos.namespace           = org.qt-project.b2qt-demos.5112
 qhp.QtforDeviceCreationDemos.virtualFolder       = b2qt-demos
-qhp.QtforDeviceCreationDemos.indexTitle          = Qt 5.10.1 for Device Creation Examples and Demos
+qhp.QtforDeviceCreationDemos.indexTitle          = Qt 5.11.2 for Device Creation Examples and Demos
 qhp.QtforDeviceCreationDemos.indexRoot           =
 
 qhp.QtforDeviceCreationDemos.subprojects         = demos
@@ -35,4 +35,4 @@ manifestmeta.b2qt.names      = "QtforDeviceCreationDemos/*"
 macro.B2Q                    = "Boot to Qt"
 macro.SDK                    = "Qt for Device Creation"
 
-navigation.landingpage = "Qt 5.10.1 for Device Creation Examples and Demos"
+navigation.landingpage = "Qt 5.11.2 for Device Creation Examples and Demos"
diff --git a/doc/images/b2qt-demo-ebike-ui.jpg b/doc/images/b2qt-demo-ebike-ui.jpg
new file mode 100644
index 0000000..570e609
--- /dev/null
+++ b/doc/images/b2qt-demo-ebike-ui.jpg
diff --git a/doc/images/b2qt-demo-enterprise-charts.jpg b/doc/images/b2qt-demo-enterprise-charts.jpg
index e2f9e6c..b472087 120000..100644
--- a/doc/images/b2qt-demo-enterprise-charts.jpg
+++ b/doc/images/b2qt-demo-enterprise-charts.jpg
diff --git a/doc/images/b2qt-demo-graphicaleffects.jpg b/doc/images/b2qt-demo-graphicaleffects.jpg
index 5a092e2..da1255b 120000..100644
--- a/doc/images/b2qt-demo-graphicaleffects.jpg
+++ b/doc/images/b2qt-demo-graphicaleffects.jpg
diff --git a/doc/images/b2qt-demo-mediaplayer.jpg b/doc/images/b2qt-demo-mediaplayer.jpg
index cce5a00..d61efbc 120000..100644
--- a/doc/images/b2qt-demo-mediaplayer.jpg
+++ b/doc/images/b2qt-demo-mediaplayer.jpg
diff --git a/doc/images/b2qt-demo-qtquickcontrols2.jpg b/doc/images/b2qt-demo-qtquickcontrols2.jpg
new file mode 100644
index 0000000..89a4fcb
--- /dev/null
+++ b/doc/images/b2qt-demo-qtquickcontrols2.jpg
diff --git a/doc/images/b2qt-demo-qtwebbrowser.jpg b/doc/images/b2qt-demo-qtwebbrowser.jpg
index 13dea2f..c63de25 120000..100644
--- a/doc/images/b2qt-demo-qtwebbrowser.jpg
+++ b/doc/images/b2qt-demo-qtwebbrowser.jpg