Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2018-06-22 13:26:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate" Fri Jun 22 13:26:22 2018 rev:97 rq:616881 version:18.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2018-06-13 15:20:05.551142814 +0200 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2018-06-22 13:26:24.658548332 +0200 @@ -1,0 +2,6 @@ +Thu Jun 14 09:51:26 UTC 2018 - [email protected] + +- Add 0002-Fix-QuickOpen-with-Qt-5.11.patch for kde#395039 + to make quick-open work again after Qt 5.11.0 update. + +------------------------------------------------------------------- New: ---- 0002-Fix-QuickOpen-with-Qt-5.11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.Lf9qu6/_old 2018-06-22 13:26:25.338523203 +0200 +++ /var/tmp/diff_new_pack.Lf9qu6/_new 2018-06-22 13:26:25.342523055 +0200 @@ -32,6 +32,8 @@ Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch0: 0001-Defuse-root-block.patch +# PATCH-FIX-UPSTREAM +Patch1: 0002-Fix-QuickOpen-with-Qt-5.11.patch BuildRequires: kactivities5-devel BuildRequires: kconfig-devel BuildRequires: kcrash-devel @@ -109,6 +111,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build ++++++ 0002-Fix-QuickOpen-with-Qt-5.11.patch ++++++ >From 291b68994d7c6176dbc1983c956e2bb7135559e0 Mon Sep 17 00:00:00 2001 From: Sven Brauch <[email protected]> Date: Wed, 13 Jun 2018 17:25:20 +0200 Subject: Fix QuickOpen with Qt 5.11 It remains to be investigated whether this is a regression in Qt itself, or misuse of the API on our side. There is at least one misuse (the call to mapFromSource) which is wrong in the old version, so this patch improves the situation in either case. Differential Revision: https://phabricator.kde.org/D13517 BUG:395039 --- kate/katequickopen.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/kate/katequickopen.cpp b/kate/katequickopen.cpp index 9e2536a..48452d1 100644 --- a/kate/katequickopen.cpp +++ b/kate/katequickopen.cpp @@ -147,7 +147,7 @@ void KateQuickOpen::update() /** * new base mode creation */ - QStandardItemModel *base_model = new QStandardItemModel(0, 2, this); + m_base_model->clear(); /** * remember local file names to avoid dupes with project files @@ -186,8 +186,8 @@ void KateQuickOpen::update() QStandardItem *itemUrl = new QStandardItem(doc->url().toString()); itemUrl->setEditable(false); - base_model->setItem(linecount, 0, itemName); - base_model->setItem(linecount, 1, itemUrl); + m_base_model->setItem(linecount, 0, itemName); + m_base_model->setItem(linecount, 1, itemUrl); linecount++; if (!doc->url().isEmpty() && doc->url().isLocalFile()) { @@ -224,8 +224,8 @@ void KateQuickOpen::update() QStandardItem *itemUrl = new QStandardItem(doc->url().toString()); itemUrl->setEditable(false); - base_model->setItem(linecount, 0, itemName); - base_model->setItem(linecount, 1, itemUrl); + m_base_model->setItem(linecount, 0, itemName); + m_base_model->setItem(linecount, 1, itemUrl); linecount++; if (!doc->url().isEmpty() && doc->url().isLocalFile()) { @@ -255,19 +255,12 @@ void KateQuickOpen::update() QStandardItem *itemUrl = new QStandardItem(file); itemUrl->setEditable(false); - base_model->setItem(linecount, 0, itemName); - base_model->setItem(linecount, 1, itemUrl); + m_base_model->setItem(linecount, 0, itemName); + m_base_model->setItem(linecount, 1, itemUrl); linecount++; } } - /** - * swap models and kill old one - */ - m_model->setSourceModel(base_model); - delete m_base_model; - m_base_model = base_model; - if (idxToSelect.isValid()) { m_listView->setCurrentIndex(m_model->mapFromSource(idxToSelect)); } else { -- cgit v0.11.2
