Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
b20a7307
Commit
b20a7307
authored
Jan 15, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix crash on new project with Qt 5.14
Related to
#494
parent
31c339ff
Pipeline
#13248
passed with stage
in 15 minutes and 28 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/timelinewidget.cpp
View file @
b20a7307
...
...
@@ -65,6 +65,7 @@ TimelineWidget::TimelineWidget(QWidget *parent)
// Build transition model for context menu
m_transitionModel
=
TransitionTreeModel
::
construct
(
true
,
this
);
m_transitionProxyModel
=
std
::
make_unique
<
TransitionFilter
>
(
this
);
m_sortModel
=
std
::
make_unique
<
QSortFilterProxyModel
>
(
this
);
static_cast
<
TransitionFilter
*>
(
m_transitionProxyModel
.
get
())
->
setFilterType
(
true
,
TransitionType
::
Favorites
);
m_transitionProxyModel
->
setSourceModel
(
m_transitionModel
.
get
());
m_transitionProxyModel
->
setSortRole
(
AssetTreeModel
::
NameRole
);
...
...
@@ -89,6 +90,8 @@ TimelineWidget::TimelineWidget(QWidget *parent)
TimelineWidget
::~
TimelineWidget
()
{
rootContext
()
->
setContextProperty
(
"multitrack"
,
0
);
rootContext
()
->
setContextProperty
(
"timeline"
,
0
);
delete
m_proxy
;
}
...
...
@@ -113,11 +116,9 @@ const QStringList TimelineWidget::sortedItems(const QStringList &items, bool isT
void
TimelineWidget
::
setModel
(
const
std
::
shared_ptr
<
TimelineItemModel
>
&
model
,
MonitorProxy
*
proxy
)
{
m_sortModel
=
std
::
make_unique
<
QSortFilterProxyModel
>
(
this
);
m_sortModel
->
setSourceModel
(
model
.
get
());
m_sortModel
->
setSortRole
(
TimelineItemModel
::
SortRole
);
m_sortModel
->
sort
(
0
,
Qt
::
DescendingOrder
);
m_proxy
->
setModel
(
model
);
rootContext
()
->
setContextProperty
(
"multitrack"
,
m_sortModel
.
get
());
rootContext
()
->
setContextProperty
(
"controller"
,
model
.
get
());
...
...
Eugen Mohr
@emohr
mentioned in issue
#516 (closed)
·
Jan 15, 2020
mentioned in issue
#516 (closed)
mentioned in issue #516
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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