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

* origin/stable: (63 commits)
  Doc: Bump version to 3.1.1
  Make FPS checkbox persistent
  Handle accelerometer readings in rotated items
  webengine: Add slight delay before loading the start page
  webengine: disable the webgl demo
  Update screenshot of the Virtual Keyboard demo
  [Doc] Use symbolic links for demo preview images
  Changed the audio track on the Qt_EnterpriseEmbedded_1080p.mp4 video.
  Fix demo descriptions.
  launchersettings: make ip field span two columns
  Remove deleted demos also from doc
  Update all VirtualKeyboard import to version 1.1
  Doc: Bump version to 3.1.0
  Doc: Content/language improvement for About QtEE demo.
  Disable GraphicalEffects demo on beagleboneblack
  about: fit text properly to the box
  Fix Meet Qt Enterprise Embedded video url on startup
  Fix a typo in the new About presentation
  About Boot to Qt-demo update
  Update Enterprise gallery demo description
  ...

Change-Id: I928ab65867993c83ae645834430fd15825349fde

1 files changed, 0 insertions, 116 deletions

diff --git a/basicsuite/qt5-launchpresentation/VideoSlide.qml b/basicsuite/qt5-launchpresentation/VideoSlide.qml
deleted file mode 100644
index a7aac8a..0000000
--- a/basicsuite/qt5-launchpresentation/VideoSlide.qml
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $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
-import QtMultimedia 5.0
-import "presentation"
-
-import QtGraphicalEffects 1.0
-
-Slide {
-
-    id: slide
-
-    title: "Qt Multimedia - Video"
-
-    Video {
-        id: video
-
-        anchors.fill: parent
-        source: "bunny.mov"
-        autoLoad: true;
-
-        layer.enabled: true;
-        layer.smooth: true;
-        layer.effect: Displace {
-            displacementSource: normalMap
-            displacement: button.pressed ? 1.0 : 0.0
-            Behavior on displacement {
-                NumberAnimation { duration: 1000 }
-            }
-        }
-    }
-
-    Rectangle {
-        id: theItem;
-        width: 256
-        height: 128
-        color: "transparent"
-        Text {
-            id: label
-            color: "white"
-            text: "Qt 5"
-//            font.family: "Times New Roman"
-            font.bold: true;
-            font.pixelSize: 80
-            anchors.centerIn: parent
-        }
-        visible: false;
-    }
-
-    NormalMapGenerator {
-        anchors.left: theItem.right
-        width: 256
-        height: 128
-        id: normalMap
-        source: theItem;
-        visible: false
-    }
-
-    centeredText: video.hasVideo ? "" : "'bunny.mov' is not found or cannot be played: " + video.errorString
-
-     onVisibleChanged: {
-         if (slide.visible)
-             video.play();
-         else
-             video.pause();
-     }
-
-     Button {
-         id: button
-         anchors.bottom: video.bottom
-         anchors.horizontalCenter: video.horizontalCenter
-         anchors.bottomMargin: height / 2;
-         label: pressed ? "Remove Effect" : "Displacement Effect";
-         width: height * 4;
-         height: parent.height * 0.1
-     }
-
-}