[neon/qt/qtbase/Neon/release] debian/patches: remove patch now in branch

Jonathan Esk-Riddell null at kde.org
Wed Jun 22 10:55:29 BST 2022


Git commit 6a2276fed1c7739a7dd1ca0397ad2153f08abb19 by Jonathan Esk-Riddell.
Committed on 22/06/2022 at 09:55.
Pushed by jriddell into branch 'Neon/release'.

remove patch now in branch

D  +0    -27   debian/patches/fusion_checkable_qpushbutton.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/6a2276fed1c7739a7dd1ca0397ad2153f08abb19

diff --git a/debian/patches/fusion_checkable_qpushbutton.diff b/debian/patches/fusion_checkable_qpushbutton.diff
deleted file mode 100644
index 239cc38..0000000
--- a/debian/patches/fusion_checkable_qpushbutton.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: QPushButton/fusion style: don't ignore QIcon::On icon
- The fusion style did ignore the QIcon::On icon because it reset
- State_On to avoid the visual shift of a pressed button.
- But it's not needed to reset this flag - the shift does not happen
- because the fusion style does return 0 as offset for
- PM_ButtonShiftHorizontal/PM_ButtonShiftVertical so no shifting will
- happen.
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e9ccdf4d84157173
-Last-Update: 2021-08-10
-
---- a/src/widgets/styles/qfusionstyle.cpp
-+++ b/src/widgets/styles/qfusionstyle.cpp
-@@ -1772,14 +1772,6 @@ void QFusionStyle::drawControl(ControlEl
-             proxy()->drawControl(CE_PushButtonLabel, &subopt, painter, widget);
-         }
-         break;
--    case CE_PushButtonLabel:
--        if (const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton *>(option)) {
--            QStyleOptionButton b(*button);
--            // no PM_ButtonShiftHorizontal and PM_ButtonShiftVertical for fusion style
--            b.state &= ~(State_On | State_Sunken);
--            QCommonStyle::drawControl(element, &b, painter, widget);
--        }
--        break;
-     case CE_MenuBarEmptyArea:
-         painter->save();
-     {
diff --git a/debian/patches/series b/debian/patches/series
index 77c3ae2..451fbfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 gcc_11_limits.diff
 fix-misplacement-of-placeholder-text-in-QLineEdit.diff
 fix-placement-of-placeholder-text-in-QLineEdits-with-action-icons.diff
-fusion_checkable_qpushbutton.diff
 full_width_selection_rtl.diff
 fix_recursion_crash.diff
 moc_handle_include.diff


More information about the Neon-commits mailing list