From 0704956f7256f1f618cc5e03af2c1dbd0e83dbc5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Jan 2020 16:18:18 +0000 Subject: gentoo resync : 16.01.2020 --- ...denlive-19.12.1-qt-5.14-new-project-crash.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch (limited to 'kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch') diff --git a/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch b/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch new file mode 100644 index 000000000000..aa4d4914b441 --- /dev/null +++ b/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch @@ -0,0 +1,44 @@ +From b20a7307368932b35ec0d7cdebb68a710cbbf8ba Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Mardelle +Date: Wed, 15 Jan 2020 11:30:20 +0100 +Subject: Fix crash on new project with Qt 5.14 Related to #494 + +--- + src/timeline2/view/timelinewidget.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/timeline2/view/timelinewidget.cpp b/src/timeline2/view/timelinewidget.cpp +index 452e4d7..f8bf6ed 100644 +--- a/src/timeline2/view/timelinewidget.cpp ++++ b/src/timeline2/view/timelinewidget.cpp +@@ -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(this); ++ m_sortModel = std::make_unique(this); + static_cast(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 &model, MonitorProxy *proxy) + { +- m_sortModel = std::make_unique(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()); +-- +cgit v1.1 -- cgit v1.2.3