Merge branch '2012'

src/timeline2/view/qml/SubTitle.qml

@@ -4,14 +4,14 @@ import QtQuick.Controls 2.4
 Item {
     id: subtitleRoot
     visible : true
-    z: 20
+    z: selected ? 30 : 20
     property int oldStartX
     property int startFrame
     property int endFrame
     property int subId
     property int duration : endFrame - startFrame
     property double tScale: root.timeScale
-    property var subtitle
+    property string subtitle
     property bool selected
     height: subtitleTrack.height
     onStartFrameChanged: {

src/timeline2/view/qml/timeline.qml

@@ -1574,47 +1574,13 @@ Rectangle {
     DelegateModel {
         id: subtitleDelegateModel
         model: subtitleModel
-        delegate: Item {
-            Loader {
-                id: loader
-                Binding {
-                    target: loader.item
-                    property: "selected"
-                    value: model.selected
-                    when: loader.status == Loader.Ready && loader.item
-                }
-                Binding {
-                    target: loader.item
-                    property: "startFrame"
-                    value: model.startframe
-                    when: loader.status == Loader.Ready && loader.item
-                }
-                Binding {
-                    target: loader.item
-                    property: "endFrame"
-                    value: model.endframe
-                    when: loader.status == Loader.Ready && loader.item
-                }
-                Binding {
-                    target: loader.item
-                    property: "subtitle"
-                    value: model.subtitle
-                    when: loader.status == Loader.Ready && loader.item
-                }
-                
-                sourceComponent: {
-                    return subTitleDelegate
-                }
-                onLoaded: {
-                    item.subId = model.id
-                }
-            }
+        delegate: SubTitle {
+            subId: model.id
+            selected: model.selected
+            startFrame: model.startframe
+            endFrame: model.endframe
+            subtitle: model.subtitle
         }
-        
-    }
-    Component {
-        id: subTitleDelegate
-        SubTitle {}
     }
 
     Connections {