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

8 files changed, 10 insertions, 10 deletions

diff --git a/wayland/democompositor/democompositor.pro b/wayland/democompositor/democompositor.pro
index f3e31de..99b6f93 100644
--- a/wayland/democompositor/democompositor.pro
+++ b/wayland/democompositor/democompositor.pro
@@ -17,3 +17,5 @@ RESOURCES += democompositor.qrc
 HEADERS += \
     processlauncher.h
 
+INSTALLS += target
+target.path = /data/user/$$TARGET
diff --git a/wayland/democompositor/democompositor.qrc b/wayland/democompositor/democompositor.qrc
index e4fcc75..940f04e 100644
--- a/wayland/democompositor/democompositor.qrc
+++ b/wayland/democompositor/democompositor.qrc
@@ -6,15 +6,15 @@
         <file>qml/MyButton.qml</file>
         <file>qml/LaunchButton.qml</file>
         <file>qml/TimedButton.qml</file>
-        <file>images/icon1.png</file>
-        <file>images/icon2.png</file>
-        <file>images/icon3.png</file>
-        <file>images/icon4.png</file>
         <file>images/quit.png</file>
         <file>images/greendot.png</file>
         <file>images/reddot.png</file>
         <file>images/graydot.png</file>
         <file>images/graydots.png</file>
         <file>images/greendots.png</file>
+        <file>images/Icon_Clocks.png</file>
+        <file>images/Icon_Maps.png</file>
+        <file>images/Icon_RSS.png</file>
+        <file>images/Icon_StocQt.png</file>
     </qresource>
 </RCC>
diff --git a/wayland/democompositor/images/Icon_Clocks.png b/wayland/democompositor/images/Icon_Clocks.png
new file mode 100644
index 0000000..0ca1955
--- /dev/null
+++ b/wayland/democompositor/images/Icon_Clocks.png
diff --git a/wayland/democompositor/images/Icon_Maps.png b/wayland/democompositor/images/Icon_Maps.png
new file mode 100644
index 0000000..fac0dc9
--- /dev/null
+++ b/wayland/democompositor/images/Icon_Maps.png
diff --git a/wayland/democompositor/images/Icon_RSS.png b/wayland/democompositor/images/Icon_RSS.png
new file mode 100644
index 0000000..54ada4f
--- /dev/null
+++ b/wayland/democompositor/images/Icon_RSS.png
diff --git a/wayland/democompositor/images/Icon_StocQt.png b/wayland/democompositor/images/Icon_StocQt.png
new file mode 100644
index 0000000..d12aec1
--- /dev/null
+++ b/wayland/democompositor/images/Icon_StocQt.png
diff --git a/wayland/democompositor/qml/MyButton.qml b/wayland/democompositor/qml/MyButton.qml
index c8397a6..30d7236 100644
--- a/wayland/democompositor/qml/MyButton.qml
+++ b/wayland/democompositor/qml/MyButton.qml
@@ -118,8 +118,6 @@ Item {
             rect.anchors.right = parent.right
             parent.longPressed = false
         }
-        onEntered: console.log("Enter: " + buttonText.text)
-        onExited: console.log("Exit: " + buttonText.text)
         drag.target: rect
         drag.threshold: 5
         drag.axis: Drag.XAxis
diff --git a/wayland/democompositor/qml/Screen.qml b/wayland/democompositor/qml/Screen.qml
index 2064480..48abd19 100644
--- a/wayland/democompositor/qml/Screen.qml
+++ b/wayland/democompositor/qml/Screen.qml
@@ -246,7 +246,7 @@ WaylandOutput {
                     textColor: textCol
                     text.text: "Clocks"
                     executable: "./clocks"
-                    icon.source: "qrc:/images/icon1.png"
+                    icon.source: "qrc:/images/Icon_Clocks.png"
                 }
 
                 LaunchButton {
@@ -257,7 +257,7 @@ WaylandOutput {
                     textColor: textCol
                     text.text: "RSS News"
                     executable: "./rssnews"
-                    icon.source: "qrc:/images/icon2.png"
+                    icon.source: "qrc:/images/Icon_RSS.png"
                 }
                 LaunchButton {
                     height: 60
@@ -267,7 +267,7 @@ WaylandOutput {
                     textColor: textCol
                     text.text: "StoQt"
                     executable: "./stocqt"
-                    icon.source: "qrc:/images/icon3.png"
+                    icon.source: "qrc:/images/Icon_StocQt.png"
                 }
                 LaunchButton {
                     height: 60
@@ -277,7 +277,7 @@ WaylandOutput {
                     textColor: textCol
                     text.text: "Maps"
                     executable: "./qml_location_mapviewer"
-                    icon.source: "qrc:/images/icon4.png"
+                    icon.source: "qrc:/images/Icon_Maps.png"
                 }
 
                 TimedButton {