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

10 files changed, 0 insertions, 416 deletions

diff --git a/basicsuite/Qt5 Particles Demo/shared/Button.qml b/basicsuite/Qt5 Particles Demo/shared/Button.qml
deleted file mode 100644
index 9bbc01a..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/Button.qml
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: container
-
-    property string text: "Button"
-    property string subText: ""
-    signal clicked
-    property alias containsMouse: mouseArea.containsMouse
-    property alias pressed: mouseArea.pressed
-    implicitHeight: col.height
-    height: implicitHeight
-    width: buttonLabel.width + 20
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        onClicked: container.clicked()
-        hoverEnabled: true
-    }
-
-    Column {
-        spacing: 2
-        id: col
-        anchors.verticalCenter: parent.verticalCenter
-        width: parent.width
-        Text {
-            id: buttonLabel
-            anchors.left: parent.left
-            anchors.leftMargin: 10
-            anchors.right: parent.right
-            anchors.rightMargin: 10
-            text: container.text
-            color: "black"
-            font.pixelSize: 22
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            styleColor: "white"
-            style: Text.Raised
-
-        }
-        Text {
-            id: buttonLabel2
-            anchors.left: parent.left
-            anchors.leftMargin: 10
-            text: container.subText
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            color: "#666"
-            font.pixelSize: 12
-        }
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/shared/LauncherList.qml b/basicsuite/Qt5 Particles Demo/shared/LauncherList.qml
deleted file mode 100644
index 4336cf3..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/LauncherList.qml
+++ /dev/null
@@ -1,148 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-Item {
-    //model is a list of {"name":"somename", "url":"file:///some/url/mainfile.qml"}
-    //function used to add to model A) to enforce scheme B) to allow Qt.resolveUrl in url assignments
-
-    function addExample(name, desc, url)
-    {
-        myModel.append({"name":name, "description":desc, "url":url})
-    }
-    function hideExample()
-    {
-        ei.visible = false;
-    }
-
-    ListView {
-        clip: true
-        delegate: SimpleLauncherDelegate{exampleItem: ei}
-        model: ListModel {id:myModel}
-        anchors.fill: parent
-        visible: !ei.visible
-    }
-
-    Item {
-        id: ei
-        visible: false
-        clip: true
-        property url exampleUrl
-        onExampleUrlChanged: visible = (exampleUrl == '' ? false : true); //Setting exampleUrl automatically shows example
-        anchors.fill: parent
-        anchors.bottomMargin: 40
-        MouseArea{
-            anchors.fill: parent
-            enabled: ei.visible
-            //Eats mouse events
-        }
-        Loader{
-            focus: true
-            source: ei.exampleUrl
-            anchors.fill: parent
-        }
-    }
-    Rectangle {
-        id: bar
-        visible: ei.visible
-        anchors.bottom: parent.bottom
-        width: parent.width
-        height: 40
-
-        Rectangle {
-            height: 1
-            color: "#ccc"
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-        }
-
-        Rectangle {
-            height: 1
-            color: "#fff"
-            anchors.top: parent.top
-            anchors.topMargin: 1
-            anchors.left: parent.left
-            anchors.right: parent.right
-        }
-
-        gradient: Gradient {
-            GradientStop { position: 0 ; color: "#eee" }
-            GradientStop { position: 1 ; color: "#ccc" }
-        }
-
-        MouseArea{
-            anchors.fill: parent
-            enabled: ei.visible
-            //Eats mouse events
-        }
-
-        Image {
-            id: back
-            source: "images/back.png"
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.verticalCenterOffset: 2
-            anchors.left: parent.left
-            anchors.leftMargin: 16
-
-            MouseArea {
-                id: mouse
-                hoverEnabled: true
-                anchors.centerIn: parent
-                width: 38
-                height: 31
-                anchors.verticalCenterOffset: -1
-                onClicked: ei.exampleUrl = ""
-                Rectangle {
-                    anchors.fill: parent
-                    opacity: mouse.pressed ? 1 : 0
-                    Behavior on opacity { NumberAnimation{ duration: 100 }}
-                    gradient: Gradient {
-                        GradientStop { position: 0 ; color: "#22000000" }
-                        GradientStop { position: 0.2 ; color: "#11000000" }
-                    }
-                    border.color: "darkgray"
-                    antialiasing: true
-                    radius: 4
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/shared/README b/basicsuite/Qt5 Particles Demo/shared/README
deleted file mode 100644
index bf16f23..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/README
+++ /dev/null
@@ -1,11 +0,0 @@
-These files are shared between multiple examples as a set of common and
-reusuable components. While they do demonstrate the building of reusable
-components in QML, they are not official examples themselves.
-Consequently they do not have entries in the Qt documentation, and are
-documented only through the code comments within the files. Developers
-new to QML are strongly encouraged to go through the official examples
-before delving into this directory.
-
-For most application use, see the Qt Quick Components project to find
-ready-made Components you can use in your own projects. Qt Declarative
-examples do not use them only to avoid external dependencies.
diff --git a/basicsuite/Qt5 Particles Demo/shared/SimpleLauncherDelegate.qml b/basicsuite/Qt5 Particles Demo/shared/SimpleLauncherDelegate.qml
deleted file mode 100644
index e891266..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/SimpleLauncherDelegate.qml
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-Rectangle {
-    id: container
-    property Item exampleItem
-    width: ListView.view.width
-    height: button.implicitHeight + 22
-
-    gradient: Gradient {
-        GradientStop {
-            position: 0
-            Behavior on color {ColorAnimation { duration: 100 }}
-            color: button.pressed ? "#e0e0e0" : "#fff"
-        }
-        GradientStop {
-            position: 1
-            Behavior on color {ColorAnimation { duration: 100 }}
-            color: button.pressed ? "#e0e0e0" : button.containsMouse ? "#f5f5f5" : "#eee"
-        }
-    }
-
-    Image {
-        id: image
-        opacity: 0.7
-        Behavior on opacity {NumberAnimation {duration: 100}}
-        source: "images/next.png"
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.right: parent.right
-        anchors.rightMargin: 16
-    }
-
-    Button {
-        id: button
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
-        anchors.right:image.left
-        text: name
-        subText: description
-        onClicked: exampleItem.exampleUrl = url;
-    }
-
-    Rectangle {
-        height: 1
-        color: "#ccc"
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/shared/images/back.png b/basicsuite/Qt5 Particles Demo/shared/images/back.png
deleted file mode 100644
index 5340209..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/images/back.png
+++ /dev/null
diff --git a/basicsuite/Qt5 Particles Demo/shared/images/next.png b/basicsuite/Qt5 Particles Demo/shared/images/next.png
deleted file mode 100644
index cdef8db..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/images/next.png
+++ /dev/null
diff --git a/basicsuite/Qt5 Particles Demo/shared/qmldir b/basicsuite/Qt5 Particles Demo/shared/qmldir
deleted file mode 100644
index 2f1e56a..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-Button 2.0 Button.qml
-LauncherList 2.0 LauncherList.qml
-SimpleLauncherDelegate 2.0 SimpleLauncherDelegate.qml
diff --git a/basicsuite/Qt5 Particles Demo/shared/quick_shared.qrc b/basicsuite/Qt5 Particles Demo/shared/quick_shared.qrc
deleted file mode 100644
index 9fc114d..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/quick_shared.qrc
+++ /dev/null
@@ -1,8 +0,0 @@
-<RCC>
-    <qresource prefix="/quick/shared">
-        <file>LauncherList.qml</file>
-        <file>SimpleLauncherDelegate.qml</file>
-        <file>Button.qml</file>
-        <file>images/back.png</file>
-    </qresource>
-</RCC>
diff --git a/basicsuite/Qt5 Particles Demo/shared/shared.h b/basicsuite/Qt5 Particles Demo/shared/shared.h
deleted file mode 100644
index eab15f3..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/shared.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QDir>
-#include <QGuiApplication>
-#include <QQmlEngine>
-#include <QQuickView>
-#define DECLARATIVE_EXAMPLE_MAIN(NAME) int main(int argc, char* argv[]) \
-{\
-    QGuiApplication app(argc,argv);\
-    QQuickView view;\
-    view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));\
-    view.setSource(QUrl("qrc:///" #NAME ".qml")); \
-    if (QGuiApplication::platformName() == QLatin1String("qnx") || \
-          QGuiApplication::platformName() == QLatin1String("eglfs")) {\
-        view.setResizeMode(QQuickView::SizeRootObjectToView);\
-        view.showFullScreen();\
-    } else {\
-        view.show();\
-    }\
-    return app.exec();\
-}
diff --git a/basicsuite/Qt5 Particles Demo/shared/shared.qrc b/basicsuite/Qt5 Particles Demo/shared/shared.qrc
deleted file mode 100644
index 4ac856e..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/shared.qrc
+++ /dev/null
@@ -1,8 +0,0 @@
-<RCC>
-    <qresource prefix="/shared">
-        <file>LauncherList.qml</file>
-        <file>SimpleLauncherDelegate.qml</file>
-        <file>Button.qml</file>
-        <file>images/back.png</file>
-    </qresource>
-</RCC>