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

1 files changed, 12 insertions, 26 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.
+*/