Fix startup crash on missing QtQuick Shapes module

Fixes #824
parent ddae45ae
......@@ -20,7 +20,6 @@ import QtQuick 2.11
import QtQuick.Controls 2.4
import Kdenlive.Controls 1.0
import QtQml.Models 2.11
import QtQuick.Shapes 1.11
import QtQuick.Window 2.2
import 'Timeline.js' as Logic
import com.enums 1.0
......@@ -354,27 +353,10 @@ Rectangle {
anchors.right: parent.right
visible: clipRoot.mixDuration > 0
color: "mediumpurple"
Shape {
anchors.fill: mixBackground
//anchors.margins: border.width
asynchronous: true
opacity: 0.4
ShapePath {
fillColor: "#000"
strokeColor: "transparent"
PathLine {x: 0; y: 0}
PathLine {x: mixCutPos.x; y: mixBackground.height}
PathLine {x: 0; y: mixBackground.height}
PathLine {x: 0; y: 0}
}
ShapePath {
fillColor: "#000"
strokeColor: "transparent"
PathLine {x: mixBackground.width; y: 0}
PathLine {x: mixBackground.width; y: mixBackground.height}
PathLine {x: mixCutPos.x; y: mixBackground.height}
PathLine {x: mixBackground.width; y: 0}
}
Loader {
id: shapeLoader
source: "MixShape.qml"
property bool valid: item !== null
}
opacity: mixArea.containsMouse || trimInMixArea.pressed || trimInMixArea.containsMouse || root.selectedMix == clipRoot.clipId ? 1 : 0.7
......
......@@ -25,6 +25,7 @@
<file alias="Track.qml">timeline2/view/qml/Track.qml</file>
<file alias="Ruler.qml">timeline2/view/qml/Ruler.qml</file>
<file alias="Clip.qml">timeline2/view/qml/Clip.qml</file>
<file alias="MixShape.qml">timeline2/view/qml/MixShape.qml</file>
<file alias="ClipThumbs.qml">timeline2/view/qml/ClipThumbs.qml</file>
<file alias="ClipAudioThumbs.qml">timeline2/view/qml/ClipAudioThumbs.qml</file>
<file alias="KeyframeView.qml">timeline2/view/qml/KeyframeView.qml</file>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment