Merge commit '3473ec2b9a38a703310b773e51ce059a8423e379' into releaseQtEE_v3.1.0

* commit '3473ec2b9a38a703310b773e51ce059a8423e379': (32 commits)
  [Doc] Use symbolic links for demo preview images
  Changed the audio track on the Qt_EnterpriseEmbedded_1080p.mp4 video.
  Fix demo descriptions.
  launchersettings: make ip field span two columns
  Remove deleted demos also from doc
  Update all VirtualKeyboard import to version 1.1
  Doc: Bump version to 3.1.0
  Doc: Content/language improvement for About QtEE demo.
  Disable GraphicalEffects demo on beagleboneblack
  about: fit text properly to the box
  Fix Meet Qt Enterprise Embedded video url on startup
  Fix a typo in the new About presentation
  About Boot to Qt-demo update
  Update Enterprise gallery demo description
  Remove incorrect assingment of QUrl to bool
  Add Meet Qt Enterprise Embedded video to mediaplayer demo
  disable camera and sensor demo from Toradex Apalis iMX6
  webengine: enable the browser example on android-nexus7v2
  Delete obsoleted demos from Boot2Qt launcher
  webengine: Add offline Morphing Cubes demo
  ...

Change-Id: Ic39278a1bc92386b9b9fe15e9d90097a67656a37

22 files changed, 18 insertions, 28 deletions

diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc
index d7498fa..0a61968 100644
--- a/doc/b2qt-demos.qdoc
+++ b/doc/b2qt-demos.qdoc
@@ -106,17 +106,6 @@
 */
 
 /*!
-    \example photogallery
-    \title Photo Gallery
-    \ingroup b2qt-demos
-    \brief A photo gallery implemented in QML.
-
-    \image b2qt-demo-photogallery.jpg
-
-    This is a simple photo gallery, showing images found in \c {/data/images} directory.
-*/
-
-/*!
     \example qt5-cinematicdemo
     \title Qt 5 Cinematic Demo
     \ingroup b2qt-demos
@@ -136,21 +125,6 @@
 */
 
 /*!
-    \example qt5-launchpresentation
-    \title Qt 5 Launch Presentation
-    \ingroup b2qt-demos
-    \brief A quick tour of what is new in Qt 5.
-
-    \image b2qt-demo-qt5-launchpresentation.jpg
-
-    This is an application written with Qt Quick, based on Qt 5.
-
-    The source code is also available here: \l {https://qt.gitorious.org/qt-labs/qt5-launch-demo}.
-    The demo makes use of the QML Presentation System, available from
-    \c {ssh://codereview.qt-project.org/qt-labs/qml-presentation-system.git} repository.
-*/
-
-/*!
     \example qt5-everywhere
     \title Qt 5 Everywhere
     \ingroup b2qt-demos
@@ -243,3 +217,15 @@
     \ingroup b2qt-demos
     \brief Displays information and settings available for the Boot to Qt launcher.
 */
+
+/*!
+    \example webengine
+    \title Qt WebEngine Browser Demo
+    \ingroup b2qt-demos
+    \brief This example demonstrates the use of the QtWebEngine WebView with Qt Quick.
+
+    \image b2qt-demo-webengine.jpg
+
+    The example can be used to browse the internet (working network connection
+    required) or run the off-line WebGL demo.
+*/
diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf
index 24a23db..2af1183 100644
--- a/doc/b2qt-demos.qdocconf
+++ b/doc/b2qt-demos.qdocconf
@@ -6,7 +6,7 @@ sourceencoding               = UTF-8
 
 project                      = QtEnterpriseEmbeddedDemos
 description                  = Qt Enterprise Embedded Examples and Demos
-version                      = 3.0.0
+version                      = 3.1.0
 
 sourcedirs                   = .
 imagedirs                   += images
@@ -21,7 +21,7 @@ exampledirs                  = ../basicsuite
 qhp.projects                 = QtEnterpriseEmbeddedDemos
 
 qhp.QtEnterpriseEmbeddedDemos.file                = b2qt-demos.qhp
-qhp.QtEnterpriseEmbeddedDemos.namespace           = com.digia.b2qt-demos.300
+qhp.QtEnterpriseEmbeddedDemos.namespace           = com.digia.b2qt-demos.310
 qhp.QtEnterpriseEmbeddedDemos.virtualFolder       = b2qt-demos
 qhp.QtEnterpriseEmbeddedDemos.indexTitle          = Qt Enterprise Embedded Examples and Demos
 qhp.QtEnterpriseEmbeddedDemos.indexRoot           =
diff --git a/doc/images/b2qt-demo-about-b2qt.jpg b/doc/images/b2qt-demo-about-b2qt.jpg
index f2eb2e0..b7c27dd 100644..120000
--- a/doc/images/b2qt-demo-about-b2qt.jpg
+++ b/doc/images/b2qt-demo-about-b2qt.jpg
diff --git a/doc/images/b2qt-demo-camera.jpg b/doc/images/b2qt-demo-camera.jpg
index 3f15310..6989f2b 100644..120000
--- a/doc/images/b2qt-demo-camera.jpg
+++ b/doc/images/b2qt-demo-camera.jpg
diff --git a/doc/images/b2qt-demo-controls-touch.jpg b/doc/images/b2qt-demo-controls-touch.jpg
index c57eac3..bd78fcf 100644..120000
--- a/doc/images/b2qt-demo-controls-touch.jpg
+++ b/doc/images/b2qt-demo-controls-touch.jpg
diff --git a/doc/images/b2qt-demo-enterprise-charts.jpg b/doc/images/b2qt-demo-enterprise-charts.jpg
index 2776b0b..e2f9e6c 100644..120000
--- a/doc/images/b2qt-demo-enterprise-charts.jpg
+++ b/doc/images/b2qt-demo-enterprise-charts.jpg
diff --git a/doc/images/b2qt-demo-enterprise-dashboard.jpg b/doc/images/b2qt-demo-enterprise-dashboard.jpg
index eb2e3b5..5a9e599 100644..120000
--- a/doc/images/b2qt-demo-enterprise-dashboard.jpg
+++ b/doc/images/b2qt-demo-enterprise-dashboard.jpg
diff --git a/doc/images/b2qt-demo-enterprise-gallery.jpg b/doc/images/b2qt-demo-enterprise-gallery.jpg
index 8ddcad8..75dfea4 100644..120000
--- a/doc/images/b2qt-demo-enterprise-gallery.jpg
+++ b/doc/images/b2qt-demo-enterprise-gallery.jpg
diff --git a/doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg b/doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg
index ee3d50d..0ac4dd3 100644..120000
--- a/doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg
+++ b/doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg
diff --git a/doc/images/b2qt-demo-graphicaleffects.jpg b/doc/images/b2qt-demo-graphicaleffects.jpg
index 80fbbd5..5a092e2 100644..120000
--- a/doc/images/b2qt-demo-graphicaleffects.jpg
+++ b/doc/images/b2qt-demo-graphicaleffects.jpg
diff --git a/doc/images/b2qt-demo-launchersettings.jpg b/doc/images/b2qt-demo-launchersettings.jpg
new file mode 120000
index 0000000..0139c4c
--- /dev/null
+++ b/doc/images/b2qt-demo-launchersettings.jpg
@@ -0,0 +1 @@
+../../basicsuite/launchersettings/preview_l.jpg
\ No newline at end of file
diff --git a/doc/images/b2qt-demo-mediaplayer.jpg b/doc/images/b2qt-demo-mediaplayer.jpg
index 0fff215..cce5a00 100644..120000
--- a/doc/images/b2qt-demo-mediaplayer.jpg
+++ b/doc/images/b2qt-demo-mediaplayer.jpg
diff --git a/doc/images/b2qt-demo-photogallery.jpg b/doc/images/b2qt-demo-photogallery.jpg
deleted file mode 100644
index 0b67f1d..0000000
--- a/doc/images/b2qt-demo-photogallery.jpg
+++ /dev/null
diff --git a/doc/images/b2qt-demo-qt5-cinematicdemo.jpg b/doc/images/b2qt-demo-qt5-cinematicdemo.jpg
index 21bb2f9..1cc8325 100644..120000
--- a/doc/images/b2qt-demo-qt5-cinematicdemo.jpg
+++ b/doc/images/b2qt-demo-qt5-cinematicdemo.jpg
diff --git a/doc/images/b2qt-demo-qt5-everywhere.jpg b/doc/images/b2qt-demo-qt5-everywhere.jpg
index 1bb40bf..0c61cdb 100644..120000
--- a/doc/images/b2qt-demo-qt5-everywhere.jpg
+++ b/doc/images/b2qt-demo-qt5-everywhere.jpg
diff --git a/doc/images/b2qt-demo-qt5-launchpresentation.jpg b/doc/images/b2qt-demo-qt5-launchpresentation.jpg
deleted file mode 100644
index 8decd76..0000000
--- a/doc/images/b2qt-demo-qt5-launchpresentation.jpg
+++ /dev/null
diff --git a/doc/images/b2qt-demo-qt5-particlesdemo.jpg b/doc/images/b2qt-demo-qt5-particlesdemo.jpg
index fa0db59..42553b8 100644..120000
--- a/doc/images/b2qt-demo-qt5-particlesdemo.jpg
+++ b/doc/images/b2qt-demo-qt5-particlesdemo.jpg
diff --git a/doc/images/b2qt-demo-sensorexplorer.jpg b/doc/images/b2qt-demo-sensorexplorer.jpg
index b0469e5..4c2797f 100644..120000
--- a/doc/images/b2qt-demo-sensorexplorer.jpg
+++ b/doc/images/b2qt-demo-sensorexplorer.jpg
diff --git a/doc/images/b2qt-demo-sensors.jpg b/doc/images/b2qt-demo-sensors.jpg
index 7ce979d..4144c1c 100644..120000
--- a/doc/images/b2qt-demo-sensors.jpg
+++ b/doc/images/b2qt-demo-sensors.jpg
diff --git a/doc/images/b2qt-demo-textinput.jpg b/doc/images/b2qt-demo-textinput.jpg
index 67a2917..ea9dcbe 100644..120000
--- a/doc/images/b2qt-demo-textinput.jpg
+++ b/doc/images/b2qt-demo-textinput.jpg
diff --git a/doc/images/b2qt-demo-webengine.jpg b/doc/images/b2qt-demo-webengine.jpg
new file mode 120000
index 0000000..5d319d8
--- /dev/null
+++ b/doc/images/b2qt-demo-webengine.jpg
@@ -0,0 +1 @@
+../../basicsuite/webengine/preview_l.jpg
\ No newline at end of file
diff --git a/doc/images/update-doc-images.sh b/doc/images/update-doc-images.sh
new file mode 100755
index 0000000..1463ac2
--- /dev/null
+++ b/doc/images/update-doc-images.sh
@@ -0,0 +1,2 @@
+rm b2qt-demo-*
+find ../../basicsuite/ -name "preview_l.jpg" -execdir sh -c 'ln -s ../../basicsuite/${PWD##*/}/preview_l.jpg ../../doc/images/b2qt-demo-${PWD##*/}.jpg' \;