Merge branch 'dev' into stable

Change-Id: Ia3862e686c17c11cd7415cd657d442e4ac8c7002

1 files changed, 39 insertions, 0 deletions

diff --git a/basicsuite/qt5-cinematicdemo/content/Background.qml b/basicsuite/qt5-cinematicdemo/content/Background.qml
new file mode 100644
index 0000000..f0225ba
--- /dev/null
+++ b/basicsuite/qt5-cinematicdemo/content/Background.qml
@@ -0,0 +1,39 @@
+import QtQuick 2.0
+import QtQuick.Particles 2.0
+
+Item {
+    id: root
+
+    anchors.fill: parent
+
+    Image {
+        id: backgroundImage
+        anchors.fill: parent
+        source: settings.showColors ? "images/background3.png" : "images/background.png"
+        Behavior on source {
+            SequentialAnimation {
+                NumberAnimation { target: backgroundImage; property: "opacity"; to: 0; duration: 400; easing.type: Easing.InQuad }
+                PropertyAction { target: backgroundImage; property: "source" }
+                NumberAnimation { target: backgroundImage; property: "opacity"; to: 1; duration: 400; easing.type: Easing.OutQuad }
+            }
+        }
+    }
+
+    // Sky stars particles
+    ParticleSystem {
+        width: parent.width
+        height: 220
+        paused: detailsView.isShown || infoView.isShown || !settings.showShootingStarParticles
+        ImageParticle {
+            source: "images/star.png"
+            rotationVariation: 10
+        }
+        Emitter {
+            anchors.fill: parent
+            emitRate: 4
+            lifeSpan: 5000
+            size: 48
+            sizeVariation: 16
+        }
+    }
+}