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, 181 deletions

diff --git a/basicsuite/Qt5Everywhere/demos/touchgallery/content/CustomAppWindow.qml b/basicsuite/Qt5Everywhere/demos/touchgallery/content/CustomAppWindow.qml
deleted file mode 100644
index e0e7bcd..0000000
--- a/basicsuite/Qt5Everywhere/demos/touchgallery/content/CustomAppWindow.qml
+++ /dev/null
@@ -1,181 +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 Qt Quick Controls module 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.Window 2.1
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls.Private 1.0
-
-/*!
-    \qmltype ApplicationWindow
-    \since QtQuick.Controls 1.0
-    \inqmlmodule QtQuick.Controls 1.0
-    \ingroup applicationwindow
-    \brief Provides a top-level application window.
-
-    ApplicationWindow is a \l Window that adds convenience for positioning items,
-    such as \l MenuBar, \l ToolBar, and \l StatusBar in a platform independent
-    manner.
-
-    \code
-    ApplicationWindow {
-        id: window
-        menuBar: MenuBar {
-            Menu { MenuItem {...} }
-            Menu { MenuItem {...} }
-        }
-
-        toolBar: ToolBar {
-            RowLayout {
-                anchors.fill: parent
-                ToolButton {...}
-            }
-        }
-
-        TabView {
-            id: myContent
-            anchors.fill: parent
-            ...
-        }
-    }
-    \endcode
-*/
-
-Rectangle {
-    id: root
-
-    /*!
-        \qmlproperty MenuBar ApplicationWindow::menuBar
-
-        This property holds the \l MenuBar.
-
-        By default, this value is not set.
-    */
-    property MenuBar menuBar: null
-
-    /*!
-        \qmlproperty Item ApplicationWindow::toolBar
-
-        This property holds the toolbar \l Item.
-
-        It can be set to any Item type, but is generally used with \l ToolBar.
-
-        By default, this value is not set. When you set the toolbar item, it will
-        be anchored automatically into the application window.
-    */
-    property Item toolBar
-
-    /*!
-        \qmlproperty Item ApplicationWindow::statusBar
-
-        This property holds the status bar \l Item.
-
-        It can be set to any Item type, but is generally used with \l StatusBar.
-
-        By default, this value is not set. When you set the status bar item, it
-        will be anchored automatically into the application window.
-    */
-    property Item statusBar
-
-    onToolBarChanged: { if (toolBar) { toolBar.parent = toolBarArea } }
-
-    onStatusBarChanged: { if (statusBar) { statusBar.parent = statusBarArea } }
-
-    /*! \internal */
-    default property alias data: contentArea.data
-
-    color: syspal.window
-
-    SystemPalette {id: syspal}
-
-    Item {
-        id: backgroundItem
-        anchors.fill: parent
-
-        Item {
-            id: toolBarArea
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: childrenRect.height
-        }
-
-        Item {
-            id: contentArea
-            anchors.top: toolBarArea.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottom: statusBarArea.top
-        }
-
-        Item {
-            id: statusBarArea
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: childrenRect.height
-        }
-
-        onVisibleChanged: if (visible && menuBar) menuBar.__parentWindow = root
-
-        states: State {
-            name: "hasMenuBar"
-            when: menuBar && !menuBar.__isNative
-
-            ParentChange {
-                target: menuBar.__contentItem
-                parent: backgroundItem
-            }
-
-            PropertyChanges {
-                target: menuBar.__contentItem
-                x: 0
-                y: 0
-                width: backgroundItem.width
-            }
-
-            AnchorChanges {
-                target: toolBarArea
-                anchors.top: menuBar.__contentItem.bottom
-            }
-        }
-    }
-}