diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-26 14:47:01 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-26 14:47:15 +0200 |
| commit | 69f43cbede072614bba882c3f5df0d9ecbf1c2f8 (patch) | |
| tree | 89b4f9657379342ce7e7f5938dd324d8df633011 | |
| parent | 5c226516b7214003f8fb8845443a751f172b0c8c (diff) | |
| parent | c4119bf8ddffe9fc037c14839692b0bf5d20053d (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable:
Fix curtain effect on Cinematic demo
Change-Id: I02601acd4d22295886a8e3d1581d1a3db31eb474
| -rw-r--r-- | basicsuite/qt5-cinematicdemo/content/InfoView.qml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/basicsuite/qt5-cinematicdemo/content/InfoView.qml b/basicsuite/qt5-cinematicdemo/content/InfoView.qml index dee035e..ba1289d 100644 --- a/basicsuite/qt5-cinematicdemo/content/InfoView.qml +++ b/basicsuite/qt5-cinematicdemo/content/InfoView.qml @@ -255,9 +255,6 @@ Item { source: ShaderEffectSource { sourceItem: viewItem; hideSource: true } rightHeight: 0 leftHeight: rightHeight - Behavior on leftHeight { - SpringAnimation { spring: .4; damping: .05; mass: .5 } - } // Hide smoothly when curtain closes opacity: 0.004 * rightHeight } |