Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
eac46c1c
Commit
eac46c1c
authored
Nov 05, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix startup crash on missing QtQuick Shapes module
Fixes
#824
parent
ddae45ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
22 deletions
+5
-22
src/timeline2/view/qml/Clip.qml
src/timeline2/view/qml/Clip.qml
+4
-22
src/uiresources.qrc
src/uiresources.qrc
+1
-0
No files found.
src/timeline2/view/qml/Clip.qml
View file @
eac46c1c
...
...
@@ -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
...
...
src/uiresources.qrc
View file @
eac46c1c
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment