Update patches for Qt 4.4.1

31 files changed, 175 insertions, 467 deletions

diff --git a/debian/changelog b/debian/changelog
index b23a583..cf82543 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-qt4-x11 (4.4.0-5) UNRELEASED; urgency=low
+qt4-x11 (4.4.1-0r1) UNRELEASED; urgency=low
+
+  * New upstream release.
 
   +++ Changes by Sune Vuorela:
 
@@ -7,7 +9,36 @@ qt4-x11 (4.4.0-5) UNRELEASED; urgency=low
   * Apply patch from friendly hurd porters. (Closes: 485931)
   * Make the rules file parallel build safe.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 18 Jul 2008 00:57:42 +0200
+  +++ Changes by Modestas Vainius:
+
+  * Resync our qt-copy patches with KDE svn:
+    * add:
+      - 0232-fix-qdesktopwidget-screen-merge.diff
+    * removed from qt-copy KDE svn:
+      - 0210-fix-crash-q3stylesheet-font-size.diff
+      - 0220-no-x-recursion-in-xerrhandler.diff
+      - 0223-fix-qpixmap-hasalpha.diff
+      - 0227-qdatastream-regression.diff
+      - 0228-qsortfilterproxymodel-invalidate-noscroll.diff
+    * refresh:
+      0167, 0180, 0195, 0203, 0209, 0214, 0216,
+      0224, 0226, 0230, 0233, 0235, 0236.
+    * other qt-copy patches are in 4.4.1.
+  * Resync our patches:
+    * remove, merged (stolen from) upstream:
+      - 0001_webkit_backround_in_scrollbars_webkit-5b0ea6b840a6e25e97b886e185...
+      - 21_qprintdialog_honour_fileprintersadded.diff
+      - 73_from4.4.1_no_AAAA_when_ipv6_disabled.diff
+      - 90_gcc43.diff
+    * partially merged upstream, leave unmerged parts:
+      - 71_hppa_unaligned_access_fix_458133.diff
+    * refresh:
+      - 05_append_qt4_target.diff
+      - 14_add_libraries_to_gui_build_where_actually_needed.diff
+      - 20_mips_atomic_ops.diff
+      - 50_kfreebsd_build_fix.diff
+
+ -- Modestas Vainius <modestas@vainius.eu>  Fri, 01 Aug 2008 21:15:03 +0300
 
 qt4-x11 (4.4.0-4) unstable; urgency=low
 
diff --git a/debian/patches/0001_webkit_backround_in_scrollbars_webkit-5b0ea6b840a6e25e97b886e1852c3fc6ef8e8d0d.diff b/debian/patches/0001_webkit_backround_in_scrollbars_webkit-5b0ea6b840a6e25e97b886e1852c3fc6ef8e8d0d.diff
deleted file mode 100644
index 5e3195c..0000000
--- a/debian/patches/0001_webkit_backround_in_scrollbars_webkit-5b0ea6b840a6e25e97b886e1852c3fc6ef8e8d0d.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-This is expected to be in 4.4.2
-
-
-From: Tor Arne Vestbø <tavestbo@trolltech.com>
-Date: Tue, 10 Jun 2008 16:04:06 +0000 (+0200)
-Subject: Fill the background of scrollbars to the window color before
-X-Git-Url: http://code.staikos.net/cgi-bin/gitweb.cgi?p=webkit;a=commitdiff_plain;h=5b0ea6b840a6e25e97b886e1852c3fc6ef8e8d0d
-
-Fill the background of scrollbars to the window color before
-letting the QStyle paint its primitive elements.
-
-Signed-off-by: Simon
----
-
-+2008-06-10  Tor Arne Vestbø  <tavestbo@trolltech.com>
-+
-+        Reviewed by Simon
-+
-+        Fill the background of scrollbars to the window color before
-+        letting the QStyle paint its primitive elements.
-+
-+        * platform/qt/PlatformScrollBarQt.cpp:
-+        (WebCore::PlatformScrollbar::paint):
-+
- 2008-05-30  Adam Treat  <treat@kde.org>
- 
-         Reviewed by Simon.
-diff --git a/WebCore/platform/qt/PlatformScrollBarQt.cpp b/WebCore/platform/qt/PlatformScrollBarQt.cpp
-index 66063eb..c7f5bdd 100644
---- a/src/3rdparty/webkit/WebCore/platform/qt/PlatformScrollBarQt.cpp
-+++ b/src/3rdparty/webkit/WebCore/platform/qt/PlatformScrollBarQt.cpp
-@@ -183,6 +183,10 @@ void PlatformScrollbar::paint(GraphicsContext* graphicsContext, const IntRect& d
- #else
-     p->translate(topLeft);
-     m_opt.rect.moveTo(QPoint(0, 0));
-+
-+    // The QStyle expects the background to be already filled
-+    p->fillRect(m_opt.rect, m_opt.palette.background());
-+
-     QApplication::style()->drawComplexControl(QStyle::CC_ScrollBar, &m_opt, p, 0);
-     m_opt.rect.moveTo(topLeft);
- #endif
diff --git a/debian/patches/0167-fix-group-reading.diff b/debian/patches/0167-fix-group-reading.diff
index c7080d5..556f29e 100644
--- a/debian/patches/0167-fix-group-reading.diff
+++ b/debian/patches/0167-fix-group-reading.diff
@@ -7,25 +7,22 @@ author: Dirk Mueller <mueller@kde.org>
 in big user environments, getgrgid_r() needs more memory than sysconf() returns.
 Try a bit harder.
 
---- a/src/corelib/io/qfsfileengine_unix.cpp
-+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -829,9 +829,16 @@
-     } else if (own == OwnerGroup) {
-         struct group *gr = 0;
- #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
--        buf.resize(sysconf(_SC_GETGR_R_SIZE_MAX));
+--- a/src/corelib//io/qfsfileengine_unix.cpp
++++ b/src/corelib//io/qfsfileengine_unix.cpp
+@@ -835,9 +835,13 @@
+         size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
+         if (size_max == -1)
+             size_max = 1024;
+-        buf.resize(size_max);
 -        struct group entry;
 -        getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr);
-+        for (unsigned size = sysconf(_SC_GETGR_R_SIZE_MAX); size < 256000; size += size)
-+        {
-+            buf.resize(size);
++        for (;size_max < 256000; size_max += size_max) {
++            buf.resize(size_max);
 +            struct group entry;
-+            // ERANGE indicates that the buffer was too small
-+            if (!getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr)
-+                || errno != ERANGE)
++            if (!getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr) || errno != ERANGE)
 +                break;
-+        }
 +
++        }
  #else
          gr = getgrgid(ownerId(own));
  #endif
diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index bbd2900..d3dead5 100644
--- a/debian/patches/0180-window-role.diff
+++ b/debian/patches/0180-window-role.diff
@@ -12,9 +12,9 @@ name as the window role and most Qt3/KDE3 code is ported to call setObjectName()
 this makes the window role set in many cases (which KWin uses for window identifying).
 
 
---- a/src/corelib/kernel/qobject.cpp
-+++ b/src/corelib/kernel/qobject.cpp
-@@ -1016,9 +1016,18 @@
+--- a/src/corelib/kernel/qobject.cpp.sav	2008-02-22 09:03:40.000000000 +0100
++++ b/src/corelib/kernel/qobject.cpp	2008-02-23 16:15:51.000000000 +0100
+@@ -1016,9 +1016,18 @@ void QObject::setObjectName(const QStrin
  {
      Q_D(QObject);
      d->objectName = name;
@@ -33,9 +33,9 @@ this makes the window role set in many cases (which KWin uses for window identif
  #ifdef QT3_SUPPORT
  /*! \internal
      QObject::child is compat but needs to call itself recursively,
---- a/src/corelib/kernel/qobject_p.h
-+++ b/src/corelib/kernel/qobject_p.h
-@@ -146,6 +146,9 @@
+--- a/src/corelib/kernel/qobject_p.h.sav	2008-02-22 09:23:44.000000000 +0100
++++ b/src/corelib/kernel/qobject_p.h	2008-02-23 16:16:46.000000000 +0100
+@@ -146,6 +146,9 @@ public:
      mutable quint32 connectedSignals;
  
      QString objectName;
@@ -45,9 +45,9 @@ this makes the window role set in many cases (which KWin uses for window identif
  
      // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
      struct Connection
---- a/src/gui/kernel/qwidget_p.h
-+++ b/src/gui/kernel/qwidget_p.h
-@@ -328,6 +328,7 @@
+--- a/src/gui/kernel/qwidget_p.h.sav	2008-02-22 09:04:04.000000000 +0100
++++ b/src/gui/kernel/qwidget_p.h	2008-02-23 16:17:07.000000000 +0100
+@@ -331,6 +331,7 @@ public:
  
  #if defined(Q_WS_X11)
      void setWindowRole();
@@ -55,9 +55,9 @@ this makes the window role set in many cases (which KWin uses for window identif
      void sendStartupMessage(const char *message) const;
      void setNetWmWindowTypes();
  #endif
---- a/src/gui/kernel/qwidget_x11.cpp
-+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -714,13 +714,17 @@
+--- a/src/gui/kernel/qwidget_x11.cpp.sav	2008-02-23 15:28:47.000000000 +0100
++++ b/src/gui/kernel/qwidget_x11.cpp	2008-02-23 16:31:47.000000000 +0100
+@@ -719,13 +719,17 @@ void QWidgetPrivate::create_sys(WId wind
          data.fstrut_dirty = 1;
  
          // declare the widget's window role
@@ -81,7 +81,7 @@ this makes the window role set in many cases (which KWin uses for window identif
          }
  
          // set client leader property
-@@ -2857,6 +2861,17 @@
+@@ -2686,6 +2792,17 @@ void QWidgetPrivate::setWindowRole()
                      (unsigned char *)windowRole.constData(), windowRole.length());
  }
  
diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff
index 3e9c2be..4ffad6a 100644
--- a/debian/patches/0195-compositing-properties.diff
+++ b/debian/patches/0195-compositing-properties.diff
@@ -9,7 +9,7 @@ so they can be used when compositing.
 
 --- a/src/gui/kernel/qwidget_x11.cpp
 +++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -657,6 +657,11 @@
+@@ -662,6 +662,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
          Q_ASSERT(id);
          XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                  &wsa);
@@ -21,7 +21,7 @@ so they can be used when compositing.
      } else if (topLevel && !desktop) {        // top-level widget
          if (!X11->wm_client_leader)
              create_wm_client_leader();
-@@ -705,13 +710,21 @@
+@@ -710,13 +715,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
          // set EWMH window types
          setNetWmWindowTypes();
  
@@ -45,7 +45,7 @@ so they can be used when compositing.
  
          // declare the widget's window role
          QByteArray windowRole;
-@@ -731,10 +744,6 @@
+@@ -736,10 +749,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
          XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                          XA_WINDOW, 32, PropModeReplace,
                          (unsigned char *)&X11->wm_client_leader, 1);
diff --git a/debian/patches/0203-qtexthtmlparser-link-color.diff b/debian/patches/0203-qtexthtmlparser-link-color.diff
index 4584160..81fc9ba 100644
--- a/debian/patches/0203-qtexthtmlparser-link-color.diff
+++ b/debian/patches/0203-qtexthtmlparser-link-color.diff
@@ -1,13 +1,13 @@
 qt-bugs@ issue : N190509
-Trolltech task ID : 190904
+Trolltech task ID : 190904 (Status: closed; Version fix: 4.5.0)
 applied: no
 author: Rafael Fernández López <ereslibre@kde.org>
 
 Links are assigned a foreground color according to the system current color scheme.
 
---- a/src/gui/text/qtexthtmlparser.cpp
-+++ b/src/gui/text/qtexthtmlparser.cpp
-@@ -1053,7 +1053,7 @@
+--- a/src/gui/text/qtexthtmlparser.cpp	(revisión: 745183)
++++ b/src/gui/text/qtexthtmlparser.cpp	(copia de trabajo)
+@@ -1053,7 +1053,7 @@ void QTextHtmlParserNode::initializeProp
                      && !attributes.at(i + 1).isEmpty()) {
                      hasHref = true;
                      charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);
diff --git a/debian/patches/0209-prevent-qt-mixing.diff b/debian/patches/0209-prevent-qt-mixing.diff
index e16793c..46790e4 100644
--- a/debian/patches/0209-prevent-qt-mixing.diff
+++ b/debian/patches/0209-prevent-qt-mixing.diff
@@ -13,9 +13,9 @@ cause problems when mixed with upstream Qt.
 This patch does not make qt-copy binary incompatible with upstream Qt.
 It only further enforces using the same sources for the whole Qt build.
 
---- a/src/corelib/kernel/qobject_p.h
-+++ b/src/corelib/kernel/qobject_p.h
-@@ -85,7 +85,9 @@
+--- a/src/corelib/kernel/qobject_p.h.sav	2008-01-29 19:37:26.000000000 +0100
++++ b/src/corelib/kernel/qobject_p.h	2008-01-30 14:08:15.000000000 +0100
+@@ -85,7 +85,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPO
  
  inline QObjectData::~QObjectData() {}
  
diff --git a/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff b/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
deleted file mode 100644
index 338478b..0000000
--- a/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-qt-bugs@ issue : 197621
-Trolltech task ID : 197836
-bugs.kde.org number : none
-applied: no
-author: Montel Laurent <montel@kde.org>
-
-This patch fixes crashs in q3stylesheet (it was possible to
-use a qfont size < 1)
-Bug reported to TT with this patch. 
-
---- a/src/qt3support/text/q3stylesheet.cpp
-+++ b/src/qt3support/text/q3stylesheet.cpp
-@@ -1463,9 +1463,9 @@
-         s = baseSize;
-     }
-     if (pixel)
--        font.setPixelSize(s);
-+        font.setPixelSize(qMax(1,s));
-     else
--        font.setPointSize(s);
-+        font.setPointSize(qMax(1,s));
- }
- 
- QT_END_NAMESPACE
diff --git a/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff b/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff
index 5a4e01b..dabd77c 100644
--- a/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff
+++ b/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff
@@ -1,5 +1,5 @@
 qt-bugs@ issue : N199058
-Trolltech task ID : none
+Trolltech task ID : 199428 (Status: closed; Version fix: 4.4.0)
 applied: no
 author: Frerich Raabe <raabe@kde.org>
 
@@ -8,9 +8,11 @@ QGraphicsProxyWidget item in a QGraphicsScene had a QWidget associated
 with it. As soon as the user pressed <Tab>, QGraphicsProxyWidget
 attempted to give the focus to *some* QWidget (even if it was null).
 
---- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
-+++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
-@@ -376,6 +376,10 @@
+Index: src/gui/graphicsview/qgraphicsproxywidget.cpp
+===================================================================
+--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp	(revision 775038)
++++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp	(working copy)
+@@ -386,6 +386,10 @@
  	}
      }
  
diff --git a/debian/patches/0216-allow-isystem-for-headers.diff b/debian/patches/0216-allow-isystem-for-headers.diff
index b6b2dbc..f693d76 100644
--- a/debian/patches/0216-allow-isystem-for-headers.diff
+++ b/debian/patches/0216-allow-isystem-for-headers.diff
@@ -22,9 +22,11 @@ This patch adds support for using -isystem to allow putting an include
 directory at the end of the compiler's header search path.
 
 
---- a/configure
-+++ b/configure
-@@ -829,6 +829,11 @@
+Index: configure
+===================================================================
+--- a/configure	(revision 777050)
++++ b/configure	(working copy)
+@@ -832,6 +832,11 @@
              VAL=`echo $1 | sed 's,-D,,'`
          fi
          ;;
@@ -36,7 +38,7 @@ directory at the end of the compiler's header search path.
      -I?*|-I)
          VAR="add_ipath"
          if [ "$1" = "-I" ]; then
-@@ -1725,6 +1730,9 @@
+@@ -1739,6 +1744,9 @@
      add_ipath)
          I_FLAGS="$I_FLAGS -I\"${VAL}\""
          ;;
diff --git a/debian/patches/0220-no-x-recursion-in-xerrhandler.diff b/debian/patches/0220-no-x-recursion-in-xerrhandler.diff
deleted file mode 100644
index d756124..0000000
--- a/debian/patches/0220-no-x-recursion-in-xerrhandler.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-qt-bugs@ issue : 205699
-Trolltech task ID : none yet
-bugs.kde.org number : none
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-os: unix
-
-X error handler is not allowed to do X protocol requests. Therefore e.g. creating
-QDragManager instance should not be allowed in it, as it results in things like
-creating X pixmaps. See https://bugzilla.novell.com/show_bug.cgi?id=368456.
-
---- a/src/gui/kernel/qdnd_x11.cpp
-+++ b/src/gui/kernel/qdnd_x11.cpp
-@@ -1700,21 +1700,23 @@
- 
- bool QX11Data::xdndHandleBadwindow()
- {
--    QDragManager *manager = QDragManager::self();
--    if (manager->object && qt_xdnd_current_target) {
--        qt_xdnd_current_target = 0;
--        qt_xdnd_current_proxy_target = 0;
--        manager->object->deleteLater();
--        manager->object = 0;
--        delete xdnd_data.deco;
--        xdnd_data.deco = 0;
--        return true;
-+    if (qt_xdnd_current_target) { // avoid possibly on-demand creating the manager in X error handler
-+        QDragManager *manager = QDragManager::self();
-+        if (manager->object) {
-+            qt_xdnd_current_target = 0;
-+            qt_xdnd_current_proxy_target = 0;
-+            manager->object->deleteLater();
-+            manager->object = 0;
-+            xdnd_data.deco->deleteLater();
-+            xdnd_data.deco = 0;
-+            return true;
-+        }
-     }
-     if (qt_xdnd_dragsource_xid) {
-         qt_xdnd_dragsource_xid = 0;
-         if (qt_xdnd_current_widget) {
-             QDragLeaveEvent e;
--            QApplication::sendEvent(qt_xdnd_current_widget, &e);
-+            QApplication::postEvent(qt_xdnd_current_widget, &e);
-             qt_xdnd_current_widget = 0;
-         }
-         return true;
diff --git a/debian/patches/0223-fix-qpixmap-hasalpha.diff b/debian/patches/0223-fix-qpixmap-hasalpha.diff
deleted file mode 100644
index 5e7a058..0000000
--- a/debian/patches/0223-fix-qpixmap-hasalpha.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-qt-bugs@ issue : N206173
-Trolltech task ID : 206174
-bugs.kde.org number : none
-applied: no
-author: Fredrik Höglund <fredrik@kde.org>
-
-Calling data->mask() in a pixmap that has an alpha channel causes
-the mask to be generated from the alpha channel.  This is a very
-expensive operation, and completely unecessary in this case since
-the generated bitmap is immediately discarded.
-
-Fix the issue by reversing the order of the tests in the return
-statement, so the function returns true if the pixmap has an alpha
-channel, without generating the mask.
-
---- a/src/gui/image/qpixmap.cpp
-+++ b/src/gui/image/qpixmap.cpp
-@@ -1661,7 +1661,7 @@
- */
- bool QPixmap::hasAlpha() const
- {
--    return (!data->mask().isNull() || data->hasAlphaChannel());
-+    return (data->hasAlphaChannel() || !data->mask().isNull());
- }
- 
- /*!
diff --git a/debian/patches/0224-fast-qpixmap-fill.diff b/debian/patches/0224-fast-qpixmap-fill.diff
index 6e6c5c6..ab0049f 100644
--- a/debian/patches/0224-fast-qpixmap-fill.diff
+++ b/debian/patches/0224-fast-qpixmap-fill.diff
@@ -14,8 +14,10 @@ This patch avoids the expensive image->pixmap conversion by simply discarding
 the old pixmap, creating a new one with the correct format, and doing the
 fill server side.
 
---- a/src/gui/image/qpixmap_x11.cpp
-+++ b/src/gui/image/qpixmap_x11.cpp
+Index: src/gui/image/qpixmap_x11.cpp
+===================================================================
+--- a/src/gui/image/qpixmap_x11.cpp	(revision 798574)
++++ b/src/gui/image/qpixmap_x11.cpp	(working copy)
 @@ -1107,7 +1107,26 @@
  {
      if (fillColor.alpha() != 255) {
diff --git a/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.diff b/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
index 8cdaeb3..2396619 100644
--- a/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.diff
+++ b/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
@@ -1,7 +1,7 @@
 qt-bugs@ issue : None
 Trolltech task ID : None
 bugs.kde.org number : 159014
-applied: yes
+applied: no
 author: Robert Knight <robertknight@gmail.com>
 
 When tabs are inserted or removed in a QTabBar, QTabBarPrivate::refresh()
@@ -19,8 +19,10 @@ of 0, which will be kept in the cache and so the tab bar will never be shown.
 
 This patch fixes the problem by calling updateGeometry() whenever the tab bar's layout is refreshed.
 
---- a/src/gui/widgets/qtabbar.cpp
-+++ b/src/gui/widgets/qtabbar.cpp
+Index: src/gui/widgets/qtabbar.cpp
+===================================================================
+--- a/src/gui/widgets/qtabbar.cpp	(revision 796858)
++++ b/src/gui/widgets/qtabbar.cpp	(working copy)
 @@ -533,8 +533,8 @@
          layoutTabs();
          makeVisible(currentIndex);
diff --git a/debian/patches/0226-qtreeview-column_resize_when_needed.diff b/debian/patches/0226-qtreeview-column_resize_when_needed.diff
index 180abec..e755a19 100644
--- a/debian/patches/0226-qtreeview-column_resize_when_needed.diff
+++ b/debian/patches/0226-qtreeview-column_resize_when_needed.diff
@@ -16,22 +16,26 @@ a
 This patch assures that if no header is shown, or if we only have one column (so
 no other columns become shrinked), the contents will be visible.
 
---- a/src/gui/itemviews/qtreeview.h
-+++ b/src/gui/itemviews/qtreeview.h
+Index: src/gui/itemviews/qtreeview.h
+===================================================================
+--- a/src/gui/itemviews/qtreeview.h	(revisión: 803370)
++++ b/src/gui/itemviews/qtreeview.h	(copia de trabajo)
 @@ -229,6 +229,7 @@
      Q_PRIVATE_SLOT(d_func(), void _q_columnsAboutToBeRemoved(const QModelIndex &, int, int))
      Q_PRIVATE_SLOT(d_func(), void _q_columnsRemoved(const QModelIndex &, int, int))
      Q_PRIVATE_SLOT(d_func(), void _q_modelAboutToBeReset())
 +    Q_PRIVATE_SLOT(d_func(), void _q_forceColumnResizeToFitContents())
  };
- 
+
  #endif // QT_NO_TREEVIEW
---- a/src/gui/itemviews/qtreeview.cpp
-+++ b/src/gui/itemviews/qtreeview.cpp
+Index: src/gui/itemviews/qtreeview.cpp
+===================================================================
+--- a/src/gui/itemviews/qtreeview.cpp	(revisión: 803370)
++++ b/src/gui/itemviews/qtreeview.cpp	(copia de trabajo)
 @@ -246,6 +246,19 @@
- 
+
      connect(d->model, SIGNAL(modelAboutToBeReset()), SLOT(_q_modelAboutToBeReset()));
- 
+
 +    // we connect these signals from the model to a slot that will call
 +    // resizeColumnToContents. This is important because if we call it only on
 +    // expand() method, when we expand a node, the filling of the model can be
@@ -48,28 +52,28 @@ no other columns become shrinked), the contents will be visible.
      if (d->sortingEnabled)
          sortByColumn(header()->sortIndicatorSection());
  }
-@@ -2787,6 +2800,8 @@
+@@ -2797,6 +2810,8 @@
      }
      if (model->canFetchMore(index))
          model->fetchMore(index);
 +
 +    _q_forceColumnResizeToFitContents();
  }
- 
+
  void QTreeViewPrivate::collapse(int item, bool emitSignal)
-@@ -2826,6 +2841,8 @@
+@@ -2836,6 +2851,8 @@
          else
              emit q->collapsed(modelIndex);
      }
 +
 +    _q_forceColumnResizeToFitContents();
  }
- 
+
  void QTreeViewPrivate::prepareAnimatedOperation(int item, AnimatedOperation::Type type)
-@@ -2937,6 +2954,25 @@
+@@ -2947,6 +2964,25 @@
      viewItems.clear();
  }
- 
+
 +void QTreeViewPrivate::_q_forceColumnResizeToFitContents()
 +{
 +    Q_Q(QTreeView);
@@ -92,13 +96,15 @@ no other columns become shrinked), the contents will be visible.
  void QTreeViewPrivate::_q_columnsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
  {
      Q_UNUSED(parent);
---- a/src/gui/itemviews/qtreeview_p.h
-+++ b/src/gui/itemviews/qtreeview_p.h
+Index: src/gui/itemviews/qtreeview_p.h
+===================================================================
+--- a/src/gui/itemviews/qtreeview_p.h	(revision 803534)
++++ b/src/gui/itemviews/qtreeview_p.h	(working copy)
 @@ -101,6 +101,7 @@
          QPixmap after;
      };
- 
+
 +    void _q_forceColumnResizeToFitContents();
      void expand(int item, bool emitSignal);
      void collapse(int item, bool emitSignal);
- 
+
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;
diff --git a/debian/patches/0228-qsortfilterproxymodel-invalidate-noscroll.diff b/debian/patches/0228-qsortfilterproxymodel-invalidate-noscroll.diff
deleted file mode 100644
index b6da2cc..0000000
--- a/debian/patches/0228-qsortfilterproxymodel-invalidate-noscroll.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-qt-bugs@ issue : none
-Trolltech task ID : 204403
-bugs.kde.org number : none
-applied: no
-author: Mikko C. <mikko.cal@gmail.com>
-
-Calling QSortFilterProxyModel::invalidate causes view
-to scroll to the current item/index.
-This behavior was not present on the Qt4.3.x. Fixed in Qt4.4.1 snapshots
-
---- a/src/gui/itemviews/qabstractitemview.cpp
-+++ b/src/gui/itemviews/qabstractitemview.cpp
-@@ -2980,7 +2980,7 @@
-     if (q->isVisible()) {
-         q->doItemsLayout();
-         const QModelIndex current = q->currentIndex();
--        if (current.isValid())
-+        if (current.isValid() && state == QAbstractItemView::EditingState)
-             q->scrollTo(current);
-     } else {
-         doDelayedItemsLayout();
diff --git a/debian/patches/0230-qtextcontrol-selectnextword.diff b/debian/patches/0230-qtextcontrol-selectnextword.diff
index 91ab87e..f57dfa0 100644
--- a/debian/patches/0230-qtextcontrol-selectnextword.diff
+++ b/debian/patches/0230-qtextcontrol-selectnextword.diff
@@ -1,5 +1,5 @@
 qt-bugs@ issue : N213258
-Trolltech task ID : 213259
+Trolltech task ID : 213259 (Status: closed; Version fix: 4.4.2)
 bugs.kde.org number : I guess there is one
 applied: no
 author: David Faure <faure@kde.org>
@@ -14,9 +14,11 @@ The patch below adds a few useful ones, i.e. possibly-conflicting ones. I guess
 be exhaustive and list all possible shortcuts there....
 
 
---- a/src/gui/text/qtextcontrol.cpp
-+++ b/src/gui/text/qtextcontrol.cpp
-@@ -1065,6 +1065,14 @@
+Index: src/gui/text/qtextcontrol.cpp
+===================================================================
+--- a/src/gui/text/qtextcontrol.cpp	(revision 803104)
++++ b/src/gui/text/qtextcontrol.cpp	(working copy)
+@@ -1065,6 +1065,14 @@ void QTextControl::processEvent(QEvent *
                             || ke == QKeySequence::MoveToPreviousWord
                             || ke == QKeySequence::MoveToStartOfDocument
                             || ke == QKeySequence::MoveToEndOfDocument
diff --git a/debian/patches/0232-fix-qdesktopwidget-screen-merge.diff b/debian/patches/0232-fix-qdesktopwidget-screen-merge.diff
new file mode 100644
index 0000000..8aeed24
--- /dev/null
+++ b/debian/patches/0232-fix-qdesktopwidget-screen-merge.diff
@@ -0,0 +1,26 @@
+qt-bugs@ issue :
+Trolltech task ID :
+bugs.kde.org number :
+applied: no
+author: Dirk Mueller <mueller@kde.org>
+
+merge screens even if they're identical in size but overlaying
+
+--- a/src/gui/kernel/qdesktopwidget_x11.cpp
++++ b/src/gui/kernel/qdesktopwidget_x11.cpp
+@@ -186,10 +186,11 @@ void QDesktopWidgetPrivate::init()
+         // merge a "cloned" screen with the previous, hiding all crtcs
+         // that are currently showing a sub-rect of the previous screen
+         rects[j].setRect(x, y, w, h);
+-        if (j > 0 && rects[j-1].intersects(rects[j]) &&
+-                (rects[j].width()*rects[j].height()) >
+-                (rects[j-1].width()*rects[j-1].height())) {
+-            rects[j-1] = rects[j];
++        if (j> 0)
++        if (j > 0 && rects[j-1].intersects(rects[j])) {
++            if ((rects[j].width()*rects[j].height()) >
++                (rects[j-1].width()*rects[j-1].height()))
++                rects[j-1] = rects[j];
+            j--;
+         }
+         workareas[i] = QRect();
diff --git a/debian/patches/0233-fix-q3textbrowser-image.diff b/debian/patches/0233-fix-q3textbrowser-image.diff
index 70e9bae..852ea3a 100644
--- a/debian/patches/0233-fix-q3textbrowser-image.diff
+++ b/debian/patches/0233-fix-q3textbrowser-image.diff
@@ -7,8 +7,7 @@ In qt4.4.x there is a regression in Q3TextBrowser it can load an image.
 
 --- a/src/qt3support/other/q3mimefactory.cpp	2008-06-25 14:30:02 -0000
 +++ b/src/qt3support/other/q3mimefactory.cpp	2008-06-25 14:30:02 -0000
-
-@@ -152,9 +152,8 @@
+@@ -182,9 +182,8 @@
          QByteArray mimetype("application/octet-stream");
          if (extensions.contains(e))
              mimetype = extensions[e].latin1();
diff --git a/debian/patches/0235-qdbus-dispatch-async-timeout.diff b/debian/patches/0235-qdbus-dispatch-async-timeout.diff
index edd7fe7..802946c 100644
--- a/debian/patches/0235-qdbus-dispatch-async-timeout.diff
+++ b/debian/patches/0235-qdbus-dispatch-async-timeout.diff
@@ -1,4 +1,4 @@
-qt-bugs@ issue : none
+qt-bugs@ issue : N218453
 Trolltech task ID : none
 bugs.kde.org number : none
 applied: no
diff --git a/debian/patches/0236-qtoolbararealayout-restore.diff b/debian/patches/0236-qtoolbararealayout-restore.diff
index 3f461b3..ae9fc03 100644
--- a/debian/patches/0236-qtoolbararealayout-restore.diff
+++ b/debian/patches/0236-qtoolbararealayout-restore.diff
@@ -7,7 +7,7 @@ author: TT
 QMainWindow::restoreState doesn't layout toolbars properly, regression
 from Qt-4.4
 
-Index: a/src/gui/widgets/qtoolbararealayout.cpp
+Index: src/gui/widgets/qtoolbararealayout.cpp
 ===================================================================
 --- a/src/gui/widgets/qtoolbararealayout.cpp	(revision 829449)
 +++ b/src/gui/widgets/qtoolbararealayout.cpp	(working copy)
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff
index d2f3b1a..55ea75e 100644
--- a/debian/patches/05_append_qt4_target.diff
+++ b/debian/patches/05_append_qt4_target.diff
@@ -2,7 +2,7 @@ author: Fathi Boudra <fabo@debian.org>
 
 --- a/config.tests/unix/compile.test
 +++ b/config.tests/unix/compile.test
-@@ -51,7 +51,7 @@
+@@ -53,7 +53,7 @@
  cd "$OUTDIR/$TEST"
  
  make distclean >/dev/null 2>&1
@@ -57,7 +57,7 @@ author: Fathi Boudra <fabo@debian.org>
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -3799,7 +3799,7 @@
+@@ -3829,7 +3829,7 @@
  }
  
  # build qmake
@@ -66,7 +66,7 @@ author: Fathi Boudra <fabo@debian.org>
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -6012,8 +6012,8 @@
+@@ -6058,8 +6058,8 @@
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +77,7 @@ author: Fathi Boudra <fabo@debian.org>
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -6313,11 +6313,11 @@
+@@ -6360,11 +6360,11 @@
  #-------------------------------------------------------------------------------
  
  echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@ author: Fathi Boudra <fabo@debian.org>
  fi
  
  # .projects      -> projects to process
-@@ -6490,7 +6490,7 @@
+@@ -6537,7 +6537,7 @@
              echo "  for $a\c"
          fi
  
@@ -102,7 +102,7 @@ author: Fathi Boudra <fabo@debian.org>
              if echo '\c' | grep '\c' >/dev/null; then
 --- a/projects.pro
 +++ b/projects.pro
-@@ -114,7 +114,7 @@
+@@ -116,7 +116,7 @@
  win32 {
     qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
  } else {
diff --git a/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff b/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff
index 47fee7e..df85eed 100644
--- a/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff
+++ b/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff
@@ -1,17 +1,10 @@
 --- a/src/gui/kernel/kernel.pri
 +++ b/src/gui/kernel/kernel.pri
-@@ -112,6 +112,7 @@
-             HEADERS += \
-                 kernel/qguieventdispatcher_glib_p.h
-             QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
-+            LIBS +=$$QT_LIBS_GLIB
- 	}
-             SOURCES += \
- 		kernel/qeventdispatcher_x11.cpp
-@@ -140,6 +141,7 @@
+@@ -141,6 +141,8 @@
              HEADERS += \
                  kernel/qeventdispatcher_glib_qws_p.h
              QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
++            LIBS +=$$QT_LIBS_GLIB
 +	    LIBS +=$$QT_LIBS_GLIB
  	}
  
diff --git a/debian/patches/20_mips_atomic_ops.diff b/debian/patches/20_mips_atomic_ops.diff
index 5e15f58..e4d7646 100644
--- a/debian/patches/20_mips_atomic_ops.diff
+++ b/debian/patches/20_mips_atomic_ops.diff
@@ -4,9 +4,9 @@ Fix compilation for Linux MIPS-I code.
 
 --- a/src/corelib/arch/mips/qatomic32.s
 +++ b/src/corelib/arch/mips/qatomic32.s
-@@ -6,10 +6,12 @@
- 	.globl	q_atomic_test_and_set_int
+@@ -7,10 +7,12 @@
  	.ent	q_atomic_test_and_set_int
+         .set mips2
  q_atomic_test_and_set_int:
 +	.set mips2
  1:	ll   $8,0($4)
@@ -17,25 +17,25 @@ Fix compilation for Linux MIPS-I code.
  	beqz $2,1b
  	nop
  	jr   $31
-@@ -21,6 +23,7 @@
- 	.globl	q_atomic_test_and_set_acquire_int
+@@ -24,6 +26,7 @@
  	.ent	q_atomic_test_and_set_acquire_int
+         .set mips2
  q_atomic_test_and_set_acquire_int:
 +	.set mips2
  1:	ll   $8,0($4)
  	bne  $8,$5,2f
  	move $2,$6
-@@ -30,6 +33,7 @@
+@@ -33,6 +36,7 @@
  	jr   $31
  	nop
  2:	sync
 +	.set mips0
  	jr   $31
  	move $2,$0
- 	.end	q_atomic_test_and_set_acquire_int
-@@ -37,11 +41,13 @@
- 	.globl	q_atomic_test_and_set_release_int
+         .set mips0
+@@ -42,11 +46,13 @@
  	.ent	q_atomic_test_and_set_release_int
+         .set mips2
  q_atomic_test_and_set_release_int:
 +	.set mips2
  	sync
@@ -47,9 +47,9 @@ Fix compilation for Linux MIPS-I code.
  	beqz $2,1b
  	nop
  	jr   $31
-@@ -53,10 +59,12 @@
- 	.globl	q_atomic_test_and_set_ptr
+@@ -60,10 +66,12 @@
  	.ent	q_atomic_test_and_set_ptr
+         .set mips2
  q_atomic_test_and_set_ptr:
 +	.set mips2
  1:	ll   $8,0($4)
@@ -60,25 +60,25 @@ Fix compilation for Linux MIPS-I code.
  	beqz $2,1b
  	nop
  	jr   $31
-@@ -68,6 +76,7 @@
- 	.globl	q_atomic_test_and_set_acquire_ptr
+@@ -77,6 +85,7 @@
  	.ent	q_atomic_test_and_set_acquire_ptr
+         .set mips2
  q_atomic_test_and_set_acquire_ptr:
 +	.set mips2
  1:	ll   $8,0($4)
  	bne  $8,$5,2f
  	move $2,$6
-@@ -77,6 +86,7 @@
+@@ -86,6 +95,7 @@
  	jr   $31
  	nop
  2:	sync
 +	.set mips0
  	jr   $31
  	move $2,$0
- 	.end	q_atomic_test_and_set_acquire_ptr
-@@ -84,11 +94,13 @@
- 	.globl	q_atomic_test_and_set_release_ptr
+         .set mips0
+@@ -95,11 +105,13 @@
  	.ent	q_atomic_test_and_set_release_ptr
+         .set mips2
  q_atomic_test_and_set_release_ptr:
 +	.set mips2
  	sync
diff --git a/debian/patches/21_qprintdialog_honour_fileprintersadded.diff b/debian/patches/21_qprintdialog_honour_fileprintersadded.diff
deleted file mode 100644
index 3df3beb..0000000
--- a/debian/patches/21_qprintdialog_honour_fileprintersadded.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gui/dialogs/qprintdialog_unix.cpp
-+++ b/src/gui/dialogs/qprintdialog_unix.cpp
-@@ -749,7 +749,7 @@
-     Q_ASSERT(index != printerCount - 3); // separator
-     widget.filename->setEnabled(false);
-     widget.lOutput->setEnabled(false);
--    if (index > printerCount - 3) { // PDF or postscript
-+    if (filePrintersAdded && index > printerCount - 3) { // PDF or postscript
-         widget.location->setText(QPrintDialog::tr("Local file"));
-         widget.type->setText(QPrintDialog::tr("Write %1 file").arg(index == printerCount - 2 ?
-                     QString::fromLatin1("PDF") : QString::fromLatin1("Postscript")));
diff --git a/debian/patches/50_kfreebsd_build_fix.diff b/debian/patches/50_kfreebsd_build_fix.diff
index 84736f6..7ed7505 100644
--- a/debian/patches/50_kfreebsd_build_fix.diff
+++ b/debian/patches/50_kfreebsd_build_fix.diff
@@ -28,7 +28,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
  #elif defined(__QNXNTO__)
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
-@@ -288,13 +288,13 @@
+@@ -289,13 +289,13 @@
  
  #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
  
@@ -55,7 +55,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
  #    include <fenv.h>
  #endif
  
-@@ -6256,7 +6256,7 @@
+@@ -6258,7 +6258,7 @@
      _control87(MCW_EM, MCW_EM);
  #endif
  
@@ -64,7 +64,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
      fenv_t envp;
      feholdexcept(&envp);
  #endif
-@@ -6272,7 +6272,7 @@
+@@ -6274,7 +6274,7 @@
  #endif //_M_X64
  #endif //Q_OS_WIN
  
diff --git a/debian/patches/71_hppa_unaligned_access_fix_458133.diff b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
index 2402781..3d77bf8 100644
--- a/debian/patches/71_hppa_unaligned_access_fix_458133.diff
+++ b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
@@ -2,68 +2,6 @@ author: Bernhard R. Link <brlink@debian.org>
 
 Fix unaligned access on hppa
 
---- a/src/corelib/global/qnumeric_p.h
-+++ b/src/corelib/global/qnumeric_p.h
-@@ -64,11 +64,17 @@
- static const unsigned char qt_armfpa_inf_bytes[] = { 0, 0, 0xf0, 0x7f, 0, 0, 0, 0 };
- static inline double qt_inf()
- {
-+    union { double d; unsigned char bytes[8]; } val;
-+
- #ifdef QT_ARMFPA
--    return *reinterpret_cast<const double *>(qt_armfpa_inf_bytes);
-+    qMemCopy(val.bytes, qt_armfpa_inf_bytes, 8);
- #else
--    return *reinterpret_cast<const double *>(QSysInfo::ByteOrder == QSysInfo::BigEndian ? qt_be_inf_bytes : qt_le_inf_bytes);
-+    if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
-+        qMemCopy(val.bytes, qt_be_inf_bytes, 8);
-+      else
-+        qMemCopy(val.bytes, qt_le_inf_bytes, 8);
- #endif
-+    return val.d;
- }
- 
- // Signaling NAN
-@@ -77,11 +83,17 @@
- static const unsigned char qt_armfpa_snan_bytes[] = { 0, 0, 0xf8, 0x7f, 0, 0, 0, 0 };
- static inline double qt_snan()
- {
-+    union { double d; unsigned char bytes[8]; } val;
-+
- #ifdef QT_ARMFPA
--    return *reinterpret_cast<const double *>(qt_armfpa_snan_bytes);
-+    qMemCopy(val.bytes, qt_armfpa_snan_bytes, 8);
- #else
--    return *reinterpret_cast<const double *>(QSysInfo::ByteOrder == QSysInfo::BigEndian ? qt_be_snan_bytes : qt_le_snan_bytes);
-+    if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
-+        qMemCopy(val.bytes, qt_be_snan_bytes, 8);
-+      else
-+        qMemCopy(val.bytes, qt_le_snan_bytes, 8);
- #endif
-+    return val.d;
- }
- 
- // Quiet NAN
-@@ -90,11 +102,17 @@
- static const unsigned char qt_armfpa_qnan_bytes[] = { 0, 0, 0xf8, 0xff, 0, 0, 0, 0 };
- static inline double qt_qnan()
- {
-+    union { double d; unsigned char bytes[8]; } val;
-+
- #ifdef QT_ARMFPA
--    return *reinterpret_cast<const double *>(qt_armfpa_qnan_bytes);
-+    qMemCopy(val.bytes, qt_armfpa_qnan_bytes, 8);
- #else
--    return *reinterpret_cast<const double *>(QSysInfo::ByteOrder == QSysInfo::BigEndian ? qt_be_qnan_bytes : qt_le_qnan_bytes);
-+    if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
-+        qMemCopy(val.bytes, qt_be_qnan_bytes, 8);
-+      else
-+        qMemCopy(val.bytes, qt_le_qnan_bytes, 8);
- #endif
-+    return val.d;
- }
- 
- static inline bool qt_is_inf(double d)
 --- a/src/3rdparty/sha1/sha1.cpp
 +++ b/src/3rdparty/sha1/sha1.cpp
 @@ -151,10 +151,10 @@
diff --git a/debian/patches/73_from4.4.1_no_AAAA_when_ipv6_disabled.diff b/debian/patches/73_from4.4.1_no_AAAA_when_ipv6_disabled.diff
deleted file mode 100644
index df618e1..0000000
--- a/debian/patches/73_from4.4.1_no_AAAA_when_ipv6_disabled.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/network/kernel/qhostinfo_unix.cpp	2008-04-28 16:11:19.000000000 +0300
-+++ b/src/network/kernel/qhostinfo_unix.cpp	2008-06-08 02:35:23.000000000 +0300
-@@ -167,8 +167,19 @@
-     struct addrinfo hints;
-     memset(&hints, 0, sizeof(hints));
-     hints.ai_family = PF_UNSPEC;
-+# ifdef AI_ADDRCONFIG
-+    hints.ai_flags = AI_ADDRCONFIG;
-+# endif
- 
-     int result = getaddrinfo(hostName.toLatin1().constData(), 0, &hints, &res);
-+# ifdef AI_ADDRCONFIG
-+    if (result == EAI_BADFLAGS) {
-+        // if the lookup failed with AI_ADDRCONFIG set, try again without it
-+        hints.ai_flags = 0;
-+        result = getaddrinfo(hostName.toLatin1().constData(), 0, &hints, &res);
-+    }
-+# endif
-+
-     if (result == 0) {
-         addrinfo *node = res;
-         QList<QHostAddress> addresses;
-@@ -200,7 +211,6 @@
-         freeaddrinfo(res);
-     } else if (result == EAI_NONAME
-                || result ==  EAI_FAIL
--               || result ==  EAI_FAIL
- #ifdef EAI_NODATA
- 	       // EAI_NODATA is deprecated in RFC 3493
- 	       || result == EAI_NODATA
diff --git a/debian/patches/90_gcc43.diff b/debian/patches/90_gcc43.diff
deleted file mode 100644
index 71dbc14..0000000
--- a/debian/patches/90_gcc43.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/sql/drivers/ibase/qsql_ibase.cpp
-+++ b/src/sql/drivers/ibase/qsql_ibase.cpp
-@@ -467,7 +467,7 @@
- }
- /* char** ? seems like bad influence from oracle ... */
- template<>
--static QList<QVariant> toList<long>(char** buf, int count, long*)
-+QList<QVariant> toList<long>(char** buf, int count, long*)
- {
-     QList<QVariant> res;
-     for (int i = 0; i < count; ++i) {
-@@ -622,7 +622,7 @@
- }
- 
- template<>
--static char* fillList<float>(char *buffer, const QList<QVariant> &list, float*)
-+char* fillList<float>(char *buffer, const QList<QVariant> &list, float*)
- {
-     for (int i = 0; i < list.size(); ++i) {
-         double val;
diff --git a/debian/patches/series b/debian/patches/series
index 81bf1f0..66ea99d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # patches from upstream
-0001_webkit_backround_in_scrollbars_webkit-5b0ea6b840a6e25e97b886e1852c3fc6ef8e8d0d.diff
 0002_https_lowercase.cpp
 0003_tab_text_cutoff.diff
 # qt-copy patches
@@ -8,17 +7,13 @@
 0195-compositing-properties.diff
 0203-qtexthtmlparser-link-color.diff
 0209-prevent-qt-mixing.diff
-0210-fix-crash-q3stylesheet-font-size.diff
 0214-fix-qgraphicsproxywidget-tab-crash.diff
 0216-allow-isystem-for-headers.diff
-0220-no-x-recursion-in-xerrhandler.diff
-0223-fix-qpixmap-hasalpha.diff
 0224-fast-qpixmap-fill.diff
-0225-invalidate-tabbar-geometry-on-refresh.diff
+0225-invalidate-tabbar-geometry-on-refresh.patch
 0226-qtreeview-column_resize_when_needed.diff
-0227-qdatastream-regression.diff
-0228-qsortfilterproxymodel-invalidate-noscroll.diff
 0230-qtextcontrol-selectnextword.diff
+0232-fix-qdesktopwidget-screen-merge.diff
 0233-fix-q3textbrowser-image.diff
 0234-fix-mysql-threaded.diff
 0235-qdbus-dispatch-async-timeout.diff
@@ -38,7 +33,6 @@
 15_fix_qmake_makefile_generation.diff
 16_hide_std_symbols_on_qtwebkit.diff
 20_mips_atomic_ops.diff
-21_qprintdialog_honour_fileprintersadded.diff
 30_webkit-unaligned-access.patch
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff
@@ -47,7 +41,5 @@
 70_hppa_ldcw_fix.diff
 71_hppa_unaligned_access_fix_458133.diff
 72_generic_arch_atomic_header_fix.diff
-73_from4.4.1_no_AAAA_when_ipv6_disabled.diff
 80_hurd_max_path.diff
 81_hurd_more_max_path.diff
-90_gcc43.diff