summaryrefslogtreecommitdiff
path: root/debian/patches/0227-qdatastream-regression.diff
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0227-qdatastream-regression.diff')
-rw-r--r--debian/patches/0227-qdatastream-regression.diff63
1 files changed, 0 insertions, 63 deletions
diff --git a/debian/patches/0227-qdatastream-regression.diff b/debian/patches/0227-qdatastream-regression.diff
deleted file mode 100644
index 17efc0e..0000000
--- a/debian/patches/0227-qdatastream-regression.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-qt-bugs@ issue : N211089
-Trolltech task ID : 211301
-bugs.kde.org number : None
-applied: no
-author: Dirk Mueller <mueller@kde.org>
-
-when launching Qt3 applications under a KDE that runs with Qt 4.4,
-all apps either hang, crash, or eat horrible amounts of memory.
-
---- a/src/gui/kernel/qpalette.cpp
-+++ b/src/gui/kernel/qpalette.cpp
-@@ -79,9 +79,9 @@
- int max = QPalette::NColorRoles;
- if (s.version() <= QDataStream::Qt_2_1)
- max = QPalette::HighlightedText + 1;
-- if (s.version() <= QDataStream::Qt_4_3)
-+ else if (s.version() <= QDataStream::Qt_4_3)
- max = QPalette::AlternateBase + 1;
-- for(int r = 0 ; r < max ; r++)
-+ for(int r = 0 ; r < max ; r++)
- s << g.brush((QPalette::ColorRole)r);
- }
- return s;
-@@ -1021,7 +1021,7 @@
- int max = QPalette::ToolTipText + 1;
- if (s.version() <= QDataStream::Qt_2_1)
- max = QPalette::HighlightedText + 1;
-- if (s.version() <= QDataStream::Qt_4_3)
-+ else if (s.version() <= QDataStream::Qt_4_3)
- max = QPalette::AlternateBase + 1;
- for (int r = 0; r < max; r++)
- s << p.d->br[grp][r];
---- a/src/gui/painting/qbrush.cpp
-+++ b/src/gui/painting/qbrush.cpp
-@@ -924,12 +924,24 @@
-
- QDataStream &operator<<(QDataStream &s, const QBrush &b)
- {
-- s << (quint8)b.style() << b.color();
-- if (b.style() == Qt::TexturePattern) {
-+ quint8 style = (quint8) b.style();
-+
-+ if (s.version() < QDataStream::Qt_4_0) {
-+
-+ if (style == Qt::LinearGradientPattern
-+ || style == Qt::RadialGradientPattern
-+ || style == Qt::ConicalGradientPattern)
-+ style = Qt::NoBrush;
-+ }
-+
-+ s << style << b.color();
-+ if (b.style() == Qt::TexturePattern)
- s << b.texture();
-- } else if (b.style() == Qt::LinearGradientPattern
-+
-+ if (s.version() >= QDataStream::Qt_4_0 && (
-+ b.style() == Qt::LinearGradientPattern
- || b.style() == Qt::RadialGradientPattern
-- || b.style() == Qt::ConicalGradientPattern) {
-+ || b.style() == Qt::ConicalGradientPattern)) {
- const QGradient *gradient = b.gradient();
- int type_as_int = int(gradient->type());
- s << type_as_int;