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

* origin/5.6:
  Doc: Language fixes for the demo descriptions
  Exclude planets demo on emulator
  democompositor: make demo deployable
  New icons
  qtwebbrowser: add pro file to create stand-alone application
  Remove android from exclude list
  Exclude canvas3d planets demo from RPi2

Change-Id: Ia84a23bb9daf45d239e4e65e342083fe410303ae

1 files changed, 12 insertions, 12 deletions

diff --git a/basicsuite/demos.xml b/basicsuite/demos.xml
index 66f2b42..690d1ee 100644
--- a/basicsuite/demos.xml
+++ b/basicsuite/demos.xml
@@ -7,7 +7,7 @@ Provides an introduction to what Qt for Device Creation is all about.
 </description>
 </application>
 
-<application title="Camera" location="/data/user/qt/camera" main="main.qml" icon="/data/user/qt/camera/preview_l.jpg" exclude="android-beaglebone;android-iMX6;android-emulator;android-nexus7v2;linux-beagleboard;linux-beaglebone;linux-raspberrypi;linux-emulator;linux-apalis-imx6;linux-colibri-vf">
+<application title="Camera" location="/data/user/qt/camera" main="main.qml" icon="/data/user/qt/camera/preview_l.jpg" exclude="linux-beagleboard;linux-beaglebone;linux-raspberrypi;linux-emulator;linux-apalis-imx6;linux-colibri-vf">
 <description>
 This example demonstrates the use of the camera features of Qt Multimedia with Qt Quick.
 
@@ -15,7 +15,7 @@ Demo can be used to take photos which are saved in the /data/images/ directory.
 </description>
 </application>
 
-<application title="Qt Canvas3D - Planets" location="/data/user/qt/canvas3d-planets" main="main.qml" icon="/data/user/qt/canvas3d-planets/preview_l.jpg" exclude="linux-raspberrypi;linux-beaglebone;android-beaglebone;linux-colibri-vf">
+<application title="Qt Canvas3D - Planets" location="/data/user/qt/canvas3d-planets" main="main.qml" icon="/data/user/qt/canvas3d-planets/preview_l.jpg" exclude="linux-emulator;linux-raspberrypi2;linux-raspberrypi;linux-beaglebone;linux-colibri-vf">
 <description>
 The Planets example showcases Qt Canvas 3D. This demo combines WebGL code and three.js with QML and Qt Quick Controls.
 </description>
@@ -41,21 +41,21 @@ The Flat Style Gallery example showcases the Qt Quick Controls. This demo combin
 </description>
 </application>
 
-<application title="Qt Data Visualization 3D - Surface Multiseries" location="/data/user/qt/enterprise-qtdatavis3d" main="main.qml" icon="/data/user/qt/enterprise-qtdatavis3d/preview_l.jpg" exclude="linux-raspberrypi;linux-raspberrypi2;android-beaglebone;linux-colibri-vf">
+<application title="Qt Data Visualization 3D - Surface Multiseries" location="/data/user/qt/enterprise-qtdatavis3d" main="main.qml" icon="/data/user/qt/enterprise-qtdatavis3d/preview_l.jpg" exclude="linux-raspberrypi;linux-raspberrypi2;linux-colibri-vf">
 <description>
-Shows how to make a 3D surface plot, displaying three layers from three different height map images using Surface3D with Qt Quick 2.
+Shows how to make a 3D surface plot, displaying three layers from three different height map images using Surface3D with Qt Quick.
 </description>
 </application>
 
-<application title="Graphical Effects" location="/data/user/qt/graphicaleffects" main="main.qml" icon="/data/user/qt/graphicaleffects/preview_l.jpg" exclude="linux-beaglebone;android-beaglebone;linux-colibri-vf">
+<application title="Graphical Effects" location="/data/user/qt/graphicaleffects" main="main.qml" icon="/data/user/qt/graphicaleffects/preview_l.jpg" exclude="linux-beaglebone;linux-colibri-vf">
 <description>
-This example shows the Qt Quick 2.0 ShaderEffect type and the Qt Graphical Effects module. Qt Quick 2.0 provides the ability to use inline GLSL in your Qt Quick applications to create stunning visual effects.
+This example shows the Qt Quick ShaderEffect type and the Qt Graphical Effects module. Qt Quick provides the ability to use inline GLSL in your Qt Quick applications to create stunning visual effects.
 
-However, as UIs typically reuse many of the same effects, the Qt Graphical Effects module provides a set of predefined, commonly used effects. This includes blur, drop-shadows, glow, blending, opacity masks and more.
+However, as UIs typically reuse many of the same effects, the Qt Graphical Effects module provides a set of predefined, commonly used effects. This includes blur, drop-shadows, glow, blending, opacity masks, and more.
 </description>
 </application>
 
-<application title="Media Player" location="/data/user/qt/mediaplayer" main="main.qml" icon="/data/user/qt/mediaplayer/preview_l.jpg" exclude="android-beaglebone;android-emulator;linux-beaglebone;linux-colibri-vf">
+<application title="Media Player" location="/data/user/qt/mediaplayer" main="main.qml" icon="/data/user/qt/mediaplayer/preview_l.jpg" exclude="linux-beaglebone;linux-colibri-vf">
 <description>
 The Media Player example demonstrates the use of media playback features provided by Qt Multimedia with Qt Quick.
 
@@ -65,15 +65,15 @@ It can play content either from a file or a network source, both videos and musi
 
 <application title="Qt5 Cinematic Demo" location="/data/user/qt/qt5-cinematicdemo" main="main.qml" icon="/data/user/qt/qt5-cinematicdemo/preview_l.jpg">
 <description>
-The Qt5 Cinematic Experience is a demo by "QUIt Coding".
+The Qt 5 Cinematic Experience is a demo by "QUIt Coding".
 
-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. The source code for this demo and more awesome looking Qt Quick examples are available from quitcoding.com.
+The demo shows off a number features of Qt Quick. 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. The source code for this demo and more awesome looking Qt Quick examples are available from quitcoding.com.
 </description>
 </application>
 
 <application title="Web Browser" location="/data/user/qt/qtwebbrowser" main="main.qml" icon="/data/user/qt/qtwebbrowser/preview_l.jpg" exclude="linux-emulator;linux-raspberrypi;linux-beaglebone;linux-colibri-vf">
 <description>
-This example demonstrates the use of the QtWebEngine WebView with Qt Quick.
+This example demonstrates the use of Qt WebEngine with Qt Quick.
 
 Demo can be used to browse the internet (working network connection required) or run the offline web page demos.
 </description>
@@ -83,7 +83,7 @@ Demo can be used to browse the internet (working network connection required) or
 <description>
 This example illustrates how to handle input on touch devices.
 
-Qt Enterprise Embedded comes with Qt Virtual Keyboard - a framework that consists of a C++ backend with support for custom input methods, as well as a reference keyboard front end implemented in QML, supporting multiple languages.
+Qt for Device Creation comes with Qt Virtual Keyboard - a framework that consists of a C++ backend with support for custom input methods, as well as a reference keyboard front end implemented in QML, supporting multiple languages.
 </description>
 </application>