Merge branch 'stable' into release

* stable: (50 commits)
  Fix deployment of QML import plugins when building in Qt Creator
  Add QtWidgets dependecy to shared.pri
  Update title and description for Text Input demo
  Update content for About Boot to Qt demo
  Fix QML GroupBox: Binding loop detected for property
  [controls-touch] Deploy images
  Remove Sensors demo from the Qt Creator's list of examples
  Remove Sensor Explorer and Particles demos from launcher
  Fix layout issues with Qt-Everywhere (touchgallery)
  [qt5-launchpresentation] Don't crop the description text on nexus
  [launcher settings] improve visual appearance
  [qt5-everywhere] update preview image
  Fix vkb import path
  Fix issues in qt5-launcher presentation
  Remove Raspberry Pi logo from demo
  Fix Canvas2D error
  Qt5-Everywhere: show network error message
  fix glsl syntax in graphical effects demo
  Update copyright year
  Limit camera & mediaplayer demos to working devices
  ...

Change-Id: I1ed9233a89ea989013b398c8480e1932949fff19

1 files changed, 0 insertions, 48 deletions

diff --git a/basicsuite/About Boot to Qt/QtForAndroid.qml b/basicsuite/About Boot to Qt/QtForAndroid.qml
deleted file mode 100644
index 2eac080..0000000
--- a/basicsuite/About Boot to Qt/QtForAndroid.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-import QtQuick 2.0
-
-Column {
-    id: root
-
-    width: parent.width
-
-    spacing: engine.smallFontSize()
-
-    Title {
-        text: "Boot2Qt vs Qt for Android"
-    }
-
-    ContentText {
-        width: parent.width
-        text: '<p align="justify">Qt for Android is a port of the Qt Framework to be used
-               for application development on the Android platform. Its
-               purpose is to enable development of applications that
-               can run on Android devices. For developers writing applications
-               for the Android ecosystem, Qt for Android is the right choice.
-
-               <p align="justify">Boot2Qt tries to strip down the Android stack to the bare minimum,
-               relying only on basic Linux features. The majority of the Android stack,
-               such as <i>SurfaceFlinger</i> or <i>DalvikVM</i> is not running in
-               Boot2Qt, resulting in faster startup times, lower memory consumption
-               and overall better performance.
-               '
-    }
-
-    Column {
-        id: diagram
-        spacing: 1
-        width: parent.width * 0.66
-        anchors.horizontalCenter: parent.horizontalCenter
-        Box { text: "Application"; accentColor: "coral" }
-        Box { text: "Qt for Android"; accentColor: Qt.rgba(0.64, 0.82, 0.15) }
-        Row {
-            width: parent.width
-            height: b.height
-            Box { id: b; width: parent.width / 2; text: "Qt Framework"; accentColor: Qt.rgba(0.64, 0.82, 0.15) }
-            Box { width: parent.width / 2; text: "Android (Dalvik)"; accentColor: "steelblue" }
-        }
-
-        Box { text: "Android Baselayer"; accentColor: "steelblue" }
-        Box { text: "Embedded Hardware"; accentColor: "steelblue"}
-    }
-
-}