patch was rejected upstream

3 files changed, 0 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index 958088e..9a50587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,6 @@ qt4-x11 (4.4.0~rc1-5) UNRELEASED; urgency=low
     such that neither patch seems to have any effect (although listviews
     still do not use active/inactive roles correctly).
   * Add qt-copy patches:
-    * 0222-statusbar-recursion
-      This patch fixes random crashes due to paintevent
-      recursion and in once case a 100% startup crash (lyx).
     * 0223-fix-qpixmap-hasalpha
       Fix a performance regression in QPixmap::hasAlpha() in Qt 4.4.
     * 0224-fast-qpixmap-fill
diff --git a/debian/patches/0222-statusbar-recursion.diff b/debian/patches/0222-statusbar-recursion.diff
deleted file mode 100644
index 6b1812f..0000000
--- a/debian/patches/0222-statusbar-recursion.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-qt-bugs@ issue : N207415
-Trolltech task ID : 207597
-bugs.kde.org number : none
-applied: no
-author: Dirk Mueller <mueller@kde.org>
-
-This patch fixes random crashes due to paintevent
-recursion and in once case a 100% startup crash (lyx).
-
---- a/src/gui/widgets/qstatusbar.cpp
-+++ b/src/gui/widgets/qstatusbar.cpp
-@@ -643,7 +643,7 @@
-     }
- 
-     emit messageChanged(d->tempItem);
--    repaint();
-+    update();
- }
- 
- /*!
diff --git a/debian/patches/series b/debian/patches/series
index 9ef840a..212fd27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@
 0214-fix-qgraphicsproxywidget-tab-crash.diff
 0216-allow-isystem-for-headers.diff
 0220-no-x-recursion-in-xerrhandler.diff
-0222-statusbar-recursion.diff
 0223-fix-qpixmap-hasalpha.diff
 0224-fast-qpixmap-fill.diff
 0225-invalidate-tabbar-geometry-on-refresh.diff