Accepting request 866944 from KDE:Frameworks5

OBS-URL: https://build.opensuse.org/request/show/866944
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kcompletion?expand=0&rev=89
This commit is contained in:
Dominique Leuenberger 2021-01-30 12:55:56 +00:00 committed by Git OBS Bridge
commit 875560fd65
3 changed files with 37 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From 7acda936f06193e9fc85ae5cf9ccc8d65971f657 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Tue, 12 Jan 2021 23:43:19 +0100
Subject: [PATCH] Fix regression caused due to porting from operator+ to
operator|
BUGS: 431493
---
src/klineedit.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/klineedit.cpp b/src/klineedit.cpp
index 1cc9316..8201259 100644
--- a/src/klineedit.cpp
+++ b/src/klineedit.cpp
@@ -1222,7 +1222,7 @@ bool KLineEditPrivate::overrideShortcut(const QKeyEvent *e)
// but doesn't dare force as "stronger than kaction shortcuts"...
else if (e->matches(QKeySequence::SelectAll)) {
return true;
- } else if (qApp->platformName() == QLatin1String("xcb") && (key == Qt::CTRL | Qt::Key_E || key == Qt::CTRL | Qt::Key_U)) {
+ } else if (qApp->platformName() == QLatin1String("xcb") && (key == (Qt::CTRL | Qt::Key_E) || key == (Qt::CTRL | Qt::Key_U))) {
return true;
}
--
2.30.0

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jan 25 22:29:28 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
- Add upstream patch to fix Okular search bar no longer closed
when pressing ESC (kde#431493):
* 0001-Fix-regression-caused-due-to-porting-from-operator-t.patch
-------------------------------------------------------------------
Wed Jan 6 10:47:23 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -36,6 +36,8 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-
Source2: frameworks.keyring
%endif
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM
Patch0: 0001-Fix-regression-caused-due-to-porting-from-operator-t.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@ -78,6 +80,7 @@ can be used with own widgets.
%prep
%setup -q
%autopatch -p1
%build
%cmake_kf5 -d build