diff --git a/dolphin.changes b/dolphin.changes index e02a560..a89bcfc 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,8 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 12 05:08:31 UTC 2016 - lbeltrame@kde.org + +- Drop properly-check-Shift-toggling.patch, upstreamed + ------------------------------------------------------------------- Tue Oct 11 20:46:04 UTC 2016 - lbeltrame@kde.org - KDE Applications 16.08.2 -https://www.kde.org/announcements/announce-applications-16.08.2.php +- https://www.kde.org/announcements/announce-applications-16.08.2.php ------------------------------------------------------------------- Wed Sep 21 17:03:38 UTC 2016 - wbauer@tmo.at diff --git a/dolphin.spec b/dolphin.spec index aa2959e..fb0a4e5 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -26,8 +26,6 @@ Url: http://www.kde.org/ Source: dolphin-%{version}.tar.xz Source1: dolphinsu.desktop Patch0: dolphin-go_up.diff -# PATCH-FIX-UPSTREAM properly-check-Shift-toggling.patch kde#354301 -- fixes toggling the "Move to Trash"/"Delete" actions in the context menu when pressing Shift -Patch1: properly-check-Shift-toggling.patch BuildRequires: baloo5-devel BuildRequires: baloo5-widgets-devel BuildRequires: extra-cmake-modules >= 1.6.0 @@ -97,7 +95,6 @@ This package contains the libraries used by Dolphin and Konqueror. %prep %setup -q -n dolphin-%{version} %patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build diff --git a/properly-check-Shift-toggling.patch b/properly-check-Shift-toggling.patch deleted file mode 100644 index 3ddfb01..0000000 --- a/properly-check-Shift-toggling.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Elvis Angelaccio -Date: Wed, 21 Sep 2016 16:13:29 +0000 -Subject: Properly check Shift toggling in DolphinRemoveAction -X-Git-Url: http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=3775ef19eaca057985b92cfa3716d3c3a1d22f0f ---- -Properly check Shift toggling in DolphinRemoveAction - -Documentation of QGuiApplication::keyboardModifiers() says that "It should -be noted this may not reflect the actual keys held on the input device at -the time of calling but rather the modifiers as last reported in one of -the above events". - -Since this method is called in DolphinContextMenu's keyPressEvent() -and keyReleaseEvent(), the first time that keyboardModifiers() is -called it doesn't report that shift has been pressed. - -Replacing this method with queryKeyboardModifiers() does the job -because the latter doesn't care about the event queue. - -BUG: 354301 -FIXED-IN: 16.08.2 -REVIEW: 128972 ---- - - ---- a/src/dolphinremoveaction.cpp -+++ b/src/dolphinremoveaction.cpp -@@ -45,7 +45,7 @@ - // Using setText(action->text()) does not apply the &-shortcut. - // This is only done until the original action has been shown at least once. To - // bypass this issue, the text and &-shortcut is applied manually. -- if (qApp->keyboardModifiers() & Qt::ShiftModifier) { -+ if (qApp->queryKeyboardModifiers() & Qt::ShiftModifier) { - m_action = m_collection ? m_collection->action(QStringLiteral("delete")) : 0; - setText(i18nc("@action:inmenu", "&Delete")); - } else { -