Hello community, here is the log from the commit of package kdenlive for openSUSE:Factory checked in at 2020-01-27 20:17:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenlive (Old) and /work/SRC/openSUSE:Factory/.kdenlive.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdenlive" Mon Jan 27 20:17:05 2020 rev:73 rq:767580 version:19.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kdenlive/kdenlive.changes 2020-01-12 23:21:18.862748008 +0100 +++ /work/SRC/openSUSE:Factory/.kdenlive.new.26092/kdenlive.changes 2020-01-27 20:17:19.416518349 +0100 @@ -1,0 +2,6 @@ +Sun Jan 26 16:55:53 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Add 0001-Fix-crash-on-new-project-with-Qt-5.14.patch to fix a crash + when loading projects (kde#416766, boo#1161548) + +------------------------------------------------------------------- New: ---- 0001-Fix-crash-on-new-project-with-Qt-5.14.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenlive.spec ++++++ --- /var/tmp/diff_new_pack.MmVOL1/_old 2020-01-27 20:17:20.760519170 +0100 +++ /var/tmp/diff_new_pack.MmVOL1/_new 2020-01-27 20:17:20.764519173 +0100 @@ -35,6 +35,7 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +Patch0: 0001-Fix-crash-on-new-project-with-Qt-5.14.patch BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -114,6 +115,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build ++++++ 0001-Fix-crash-on-new-project-with-Qt-5.14.patch ++++++ >From b20a7307368932b35ec0d7cdebb68a710cbbf8ba Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle <j...@kdenlive.org> Date: Wed, 15 Jan 2020 11:30:20 +0100 Subject: [PATCH] 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 452e4d761..f8bf6edc4 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<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()); -- 2.24.1
