rev 11838 - in trunk/packages/qt4-x11/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Sat Aug 2 22:12:48 UTC 2008 

Author: fabo
Date: 2008-08-02 22:12:48 +0000 (Sat, 02 Aug 2008)
New Revision: 11838

Added:
   trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.diff
   trunk/packages/qt4-x11/debian/patches/0238-fix-qt-qttabbar-size.diff
   trunk/packages/qt4-x11/debian/patches/0241-fix-null-stylesheet-warning.diff
Removed:
   trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.cpp
   trunk/packages/qt4-x11/debian/patches/0003_tab_text_cutoff.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
   trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
   trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
   trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
   trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
   trunk/packages/qt4-x11/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff
   trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
   trunk/packages/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff
   trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
   trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
   trunk/packages/qt4-x11/debian/patches/0230-qtextcontrol-selectnextword.diff
   trunk/packages/qt4-x11/debian/patches/0232-fix-qdesktopwidget-screen-merge.diff
   trunk/packages/qt4-x11/debian/patches/0233-fix-q3textbrowser-image.diff
   trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
   trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff
   trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff
   trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
   trunk/packages/qt4-x11/debian/patches/30_webkit-unaligned-access.patch
   trunk/packages/qt4-x11/debian/patches/72_generic_arch_atomic_header_fix.diff
   trunk/packages/qt4-x11/debian/patches/series
Log:
Rename 0002_https_lowercase.cpp to 0002_https_lowercase.diff
Rename 0003_tab_text_cutoff.diff to 0238-fix-qt-qttabbar-size.diff
Refresh patches with quilt as it was before.
Add 0241-fix-null-stylesheet-warning.diff from qt-copy
Close #483790, fixed by Qt4.4.1


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/changelog	2008-08-02 22:12:48 UTC (rev 11838)
@@ -1,11 +1,15 @@
 qt4-x11 (4.4.1-0r2) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release. (Closes: #483790)
 
+  +++ Changes by Fathi Boudra:
+
+  * Add 0241-fix-null-stylesheet-warning.diff from qt-copy.
+
   +++ Changes by Sune Vuorela:
 
   * Remove watchfile. it doesn't work.
-  * mention qmake-qt4 in description of libqt4-dev. (Closes: 415816) 
+  * mention qmake-qt4 in description of libqt4-dev. (Closes: 415816)
   * Apply patch from friendly hurd porters. (Closes: 485931)
   * Make the rules file parallel build safe.
 

Deleted: trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.cpp

Copied: trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.diff (from rev 11831, trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.cpp)
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -0,0 +1,33 @@
+Fetched from 4.4.2
+treat Https, HTtps, hTTps, ... as https as well
+
+--- a/src/network/access/qnetworkaccesshttpbackend.cpp
++++ b/src/network/access/qnetworkaccesshttpbackend.cpp
+@@ -64,7 +64,7 @@
+ static QByteArray makeCacheKey(const QUrl &url)
+ {
+     QUrl copy = url;
+-    bool isEncrypted = url.scheme() == QLatin1String("https");
++    bool isEncrypted = url.scheme().toLower() == QLatin1String("https");
+     copy.setPort(url.port(isEncrypted ? DefaultHttpsPort : DefaultHttpPort));
+     return "http-connection:" + copy.toEncoded(QUrl::RemovePassword | QUrl::RemovePath |
+                                                QUrl::RemoveQuery | QUrl::RemoveFragment);
+@@ -88,7 +88,8 @@
+     }
+ 
+     QUrl url = request.url();
+-    if (url.scheme() == QLatin1String("http") || url.scheme() == QLatin1String("https"))
++    QString scheme = url.scheme().lower();
++    if (scheme == QLatin1String("http") || scheme == QLatin1String("https"))
+         return new QNetworkAccessHttpBackend;
+ 
+     return 0;
+@@ -309,7 +310,7 @@
+ void QNetworkAccessHttpBackend::open()
+ {
+     QUrl url = request().url();
+-    bool encrypt = url.scheme() == QLatin1String("https");
++    bool encrypt = url.scheme().toLower() == QLatin1String("https");
+     setAttribute(QNetworkRequest::ConnectionEncryptedAttribute, encrypt);
+ 
+     // set the port number in the reply if it wasn't set


Property changes on: trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.diff
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: trunk/packages/qt4-x11/debian/patches/0003_tab_text_cutoff.diff

Modified: trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -7,8 +7,8 @@
 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
+--- 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)

Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -12,9 +12,9 @@
 this makes the window role set in many cases (which KWin uses for window identifying).
 
 
---- 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
+--- a/src/corelib/kernel/qobject.cpp
++++ b/src/corelib/kernel/qobject.cpp
+@@ -1016,9 +1016,18 @@
  {
      Q_D(QObject);
      d->objectName = name;
@@ -33,9 +33,9 @@
  #ifdef QT3_SUPPORT
  /*! \internal
      QObject::child is compat but needs to call itself recursively,
---- 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:
+--- a/src/corelib/kernel/qobject_p.h
++++ b/src/corelib/kernel/qobject_p.h
+@@ -146,6 +146,9 @@
      mutable quint32 connectedSignals;
  
      QString objectName;
@@ -45,9 +45,9 @@
  
      // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
      struct Connection
---- 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:
+--- a/src/gui/kernel/qwidget_p.h
++++ b/src/gui/kernel/qwidget_p.h
+@@ -331,6 +331,7 @@
  
  #if defined(Q_WS_X11)
      void setWindowRole();
@@ -55,9 +55,9 @@
      void sendStartupMessage(const char *message) const;
      void setNetWmWindowTypes();
  #endif
---- 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
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
+@@ -719,13 +719,17 @@
          data.fstrut_dirty = 1;
  
          // declare the widget's window role
@@ -81,7 +81,7 @@
          }
  
          // set client leader property
-@@ -2686,6 +2792,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2686,6 +2690,17 @@
                      (unsigned char *)windowRole.constData(), windowRole.length());
  }
  

Modified: trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -9,7 +9,7 @@
 
 --- a/src/gui/kernel/qwidget_x11.cpp
 +++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -662,6 +662,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+@@ -662,6 +662,11 @@
          Q_ASSERT(id);
          XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                  &wsa);
@@ -21,7 +21,7 @@
      } else if (topLevel && !desktop) {        // top-level widget
          if (!X11->wm_client_leader)
              create_wm_client_leader();
-@@ -710,13 +715,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+@@ -710,13 +715,21 @@
          // set EWMH window types
          setNetWmWindowTypes();
  
@@ -45,7 +45,7 @@
  
          // declare the widget's window role
          QByteArray windowRole;
-@@ -736,10 +749,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+@@ -736,10 +749,6 @@
          XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                          XA_WINDOW, 32, PropModeReplace,
                          (unsigned char *)&X11->wm_client_leader, 1);

Modified: trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -5,9 +5,9 @@
 
 Links are assigned a foreground color according to the system current color scheme.
 
---- 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
+--- a/src/gui/text/qtexthtmlparser.cpp
++++ b/src/gui/text/qtexthtmlparser.cpp
+@@ -1053,7 +1053,7 @@
                      && !attributes.at(i + 1).isEmpty()) {
                      hasHref = true;
                      charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);

Modified: trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -13,9 +13,9 @@
 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.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
+--- a/src/corelib/kernel/qobject_p.h
++++ b/src/corelib/kernel/qobject_p.h
+@@ -85,7 +85,9 @@
  
  inline QObjectData::~QObjectData() {}
  

Modified: trunk/packages/qt4-x11/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -8,10 +8,8 @@
 with it. As soon as the user pressed <Tab>, QGraphicsProxyWidget
 attempted to give the focus to *some* QWidget (even if it was null).
 
-Index: src/gui/graphicsview/qgraphicsproxywidget.cpp
-===================================================================
---- a/src/gui/graphicsview/qgraphicsproxywidget.cpp	(revision 775038)
-+++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp	(working copy)
+--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
++++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
 @@ -386,6 +386,10 @@
  	}
      }

Modified: trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -22,10 +22,8 @@
 directory at the end of the compiler's header search path.
 
 
-Index: configure
-===================================================================
---- a/configure	(revision 777050)
-+++ b/configure	(working copy)
+--- a/configure
++++ b/configure
 @@ -832,6 +832,11 @@
              VAL=`echo $1 | sed 's,-D,,'`
          fi

Modified: trunk/packages/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -14,10 +14,8 @@
 the old pixmap, creating a new one with the correct format, and doing the
 fill server side.
 
-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)
+--- a/src/gui/image/qpixmap_x11.cpp
++++ b/src/gui/image/qpixmap_x11.cpp
 @@ -1107,7 +1107,26 @@
  {
      if (fillColor.alpha() != 255) {

Modified: trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch	2008-08-02 22:12:48 UTC (rev 11838)
@@ -19,10 +19,8 @@
 
 This patch fixes the problem by calling updateGeometry() whenever the tab bar's layout is refreshed.
 
-Index: src/gui/widgets/qtabbar.cpp
-===================================================================
---- a/src/gui/widgets/qtabbar.cpp	(revision 796858)
-+++ b/src/gui/widgets/qtabbar.cpp	(working copy)
+--- a/src/gui/widgets/qtabbar.cpp
++++ b/src/gui/widgets/qtabbar.cpp
 @@ -533,8 +533,8 @@
          layoutTabs();
          makeVisible(currentIndex);

Modified: trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -16,26 +16,22 @@
 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.
 
-Index: src/gui/itemviews/qtreeview.h
-===================================================================
---- a/src/gui/itemviews/qtreeview.h	(revisión: 803370)
-+++ b/src/gui/itemviews/qtreeview.h	(copia de trabajo)
+--- a/src/gui/itemviews/qtreeview.h
++++ b/src/gui/itemviews/qtreeview.h
 @@ -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
-Index: src/gui/itemviews/qtreeview.cpp
-===================================================================
---- a/src/gui/itemviews/qtreeview.cpp	(revisión: 803370)
-+++ b/src/gui/itemviews/qtreeview.cpp	(copia de trabajo)
+--- a/src/gui/itemviews/qtreeview.cpp
++++ b/src/gui/itemviews/qtreeview.cpp
 @@ -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
@@ -59,7 +55,7 @@
 +
 +    _q_forceColumnResizeToFitContents();
  }
-
+ 
  void QTreeViewPrivate::collapse(int item, bool emitSignal)
 @@ -2836,6 +2851,8 @@
          else
@@ -68,12 +64,12 @@
 +
 +    _q_forceColumnResizeToFitContents();
  }
-
+ 
  void QTreeViewPrivate::prepareAnimatedOperation(int item, AnimatedOperation::Type type)
 @@ -2947,6 +2964,25 @@
      viewItems.clear();
  }
-
+ 
 +void QTreeViewPrivate::_q_forceColumnResizeToFitContents()
 +{
 +    Q_Q(QTreeView);
@@ -96,15 +92,13 @@
  void QTreeViewPrivate::_q_columnsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
  {
      Q_UNUSED(parent);
-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)
+--- a/src/gui/itemviews/qtreeview_p.h
++++ b/src/gui/itemviews/qtreeview_p.h
 @@ -101,6 +101,7 @@
          QPixmap after;
      };
-
+ 
 +    void _q_forceColumnResizeToFitContents();
      void expand(int item, bool emitSignal);
      void collapse(int item, bool emitSignal);
-
+ 

Modified: trunk/packages/qt4-x11/debian/patches/0230-qtextcontrol-selectnextword.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0230-qtextcontrol-selectnextword.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0230-qtextcontrol-selectnextword.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -14,11 +14,9 @@
 be exhaustive and list all possible shortcuts there....
 
 
-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 *
+--- a/src/gui/text/qtextcontrol.cpp
++++ b/src/gui/text/qtextcontrol.cpp
+@@ -1065,6 +1065,14 @@
                             || ke == QKeySequence::MoveToPreviousWord
                             || ke == QKeySequence::MoveToStartOfDocument
                             || ke == QKeySequence::MoveToEndOfDocument

Modified: trunk/packages/qt4-x11/debian/patches/0232-fix-qdesktopwidget-screen-merge.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0232-fix-qdesktopwidget-screen-merge.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0232-fix-qdesktopwidget-screen-merge.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -8,7 +8,7 @@
 
 --- a/src/gui/kernel/qdesktopwidget_x11.cpp
 +++ b/src/gui/kernel/qdesktopwidget_x11.cpp
-@@ -186,10 +186,11 @@ void QDesktopWidgetPrivate::init()
+@@ -186,10 +186,11 @@
          // 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);

Modified: trunk/packages/qt4-x11/debian/patches/0233-fix-q3textbrowser-image.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0233-fix-q3textbrowser-image.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0233-fix-q3textbrowser-image.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -5,8 +5,8 @@
 
 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
+--- a/src/qt3support/other/q3mimefactory.cpp
++++ b/src/qt3support/other/q3mimefactory.cpp
 @@ -182,9 +182,8 @@
          QByteArray mimetype("application/octet-stream");
          if (extensions.contains(e))

Modified: trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -7,8 +7,8 @@
 This patch will fix the handling of connections to
 mysql server in a multithreaded environment
 
---- a/src/sql/drivers/mysql/qsql_mysql.cpp	(revision 804421)
-+++ b/src/sql/drivers/mysql/qsql_mysql.cpp	(working copy)
+--- a/src/sql/drivers/mysql/qsql_mysql.cpp
++++ b/src/sql/drivers/mysql/qsql_mysql.cpp
 @@ -1215,6 +1215,10 @@
      d->preparedQuerysEnabled = false;
  #endif

Modified: trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -8,8 +8,8 @@
 after handling them. This is neccessary in order to receive timeout
 errors to asynchroneous messages.
 
---- a/src/dbus/qdbusintegrator.cpp	(Revision 827848)
-+++ b/src/dbus/qdbusintegrator.cpp	(Arbeitskopie)
+--- a/src/dbus/qdbusintegrator.cpp
++++ b/src/dbus/qdbusintegrator.cpp
 @@ -988,6 +988,7 @@
  {
      DBusTimeout *timeout = timeouts.value(e->timerId(), 0);

Modified: trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -7,11 +7,9 @@
 QMainWindow::restoreState doesn't layout toolbars properly, regression
 from Qt-4.4
 
-Index: src/gui/widgets/qtoolbararealayout.cpp
-===================================================================
---- a/src/gui/widgets/qtoolbararealayout.cpp	(revision 829449)
-+++ b/src/gui/widgets/qtoolbararealayout.cpp	(working copy)
-@@ -1323,7 +1323,8 @@ bool QToolBarAreaLayout::restoreState(QD
+--- a/src/gui/widgets/qtoolbararealayout.cpp
++++ b/src/gui/widgets/qtoolbararealayout.cpp
+@@ -1323,7 +1323,8 @@
                  toolBar->setVisible(shown);
                  toolBar->d_func()->setWindowState(floating, true, rect);
  

Added: trunk/packages/qt4-x11/debian/patches/0238-fix-qt-qttabbar-size.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0238-fix-qt-qttabbar-size.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0238-fix-qt-qttabbar-size.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -0,0 +1,20 @@
+qt-bugs@ issue : N216195
+Trolltech task ID : 216537
+bugs.kde.org number : 162737
+applied: no
+author: Michael Leupold <lemma at confuego.org>
+
+This patch fixes some characters in a tabbar being cut-off due
+to a wrong size hint (visible if using a kstyle).
+
+--- a/src/gui/widgets/qtabbar.cpp
++++ b/src/gui/widgets/qtabbar.cpp
+@@ -1084,7 +1084,7 @@
+         QStyleOptionTabV2 opt;
+         initStyleOption(&opt, index);
+         opt.text = d->tabList.at(index).text;
+-        QSize iconSize = tab->icon.isNull() ? QSize() : opt.iconSize;
++        QSize iconSize = tab->icon.isNull() ? QSize(0, 0) : opt.iconSize;
+         int hframe  = style()->pixelMetric(QStyle::PM_TabBarTabHSpace, &opt, this);
+         int vframe  = style()->pixelMetric(QStyle::PM_TabBarTabVSpace, &opt, this);
+         const QFontMetrics fm = fontMetrics();

Added: trunk/packages/qt4-x11/debian/patches/0241-fix-null-stylesheet-warning.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0241-fix-null-stylesheet-warning.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0241-fix-null-stylesheet-warning.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -0,0 +1,22 @@
+qt-bugs@ issue : none
+Trolltech task ID : none
+bugs.kde.org number : none
+applied: no
+author: Robert Knight <robertknight at gmail.com>
+
+Fix a QObject::connect() warning when calling QWidget::setFont()
+on a widget which does not have its own style sheet and which has
+children with Qt::WA_StyleSheet set (as a result of being polished
+by a style sheet style)
+
+--- a/src/gui/kernel/qwidget.cpp
++++ b/src/gui/kernel/qwidget.cpp
+@@ -4001,7 +4001,7 @@
+         QWidget *w = qobject_cast<QWidget*>(children.at(i));
+         if (w) {
+ #ifndef QT_NO_STYLE_STYLESHEET
+-            if (w->testAttribute(Qt::WA_StyleSheet))
++            if (cssStyle && w->testAttribute(Qt::WA_StyleSheet))
+                 cssStyle->updateStyleSheetFont(w);
+             else
+ #endif

Modified: trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -1,5 +1,3 @@
-Index: b/src/3rdparty/webkit/WebKit.pri
-===================================================================
 --- a/src/3rdparty/webkit/WebKit.pri
 +++ b/src/3rdparty/webkit/WebKit.pri
 @@ -27,6 +27,7 @@
@@ -10,8 +8,6 @@
  gtk-port:INCLUDEPATH += \
      $$BASE_DIR/WebCore/platform/gtk \
      $$BASE_DIR/WebCore/platform/network/curl \
-Index: b/src/3rdparty/webkit/symbols.filter
-===================================================================
 --- /dev/null
 +++ b/src/3rdparty/webkit/symbols.filter
 @@ -0,0 +1,5 @@

Modified: trunk/packages/qt4-x11/debian/patches/30_webkit-unaligned-access.patch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/30_webkit-unaligned-access.patch	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/30_webkit-unaligned-access.patch	2008-08-02 22:12:48 UTC (rev 11838)
@@ -12,8 +12,6 @@
 a real problem yet.
 ---
 
-Index: b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
-===================================================================
 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
 +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
 @@ -1267,14 +1267,14 @@
@@ -33,8 +31,6 @@
      TCMalloc_PageHeap m_pageHeap;
  } PageHeapUnion;
  
-Index: b/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
-===================================================================
 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
 +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
 @@ -122,7 +122,7 @@
@@ -67,8 +63,6 @@
      };
  
      template<typename ValueArg> struct ListHashSetNode {
-Index: b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-===================================================================
 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
 +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
 @@ -167,6 +167,23 @@
@@ -95,8 +89,6 @@
  /* Compiler */
  
  /* COMPILER(MSVC) */
-Index: b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
-===================================================================
 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
 +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
 @@ -355,8 +355,7 @@
@@ -109,8 +101,6 @@
      };
  
      template<typename T, size_t inlineCapacity = 0>
-Index: b/src/3rdparty/webkit/WebCore/platform/AtomicString.cpp
-===================================================================
 --- a/src/3rdparty/webkit/WebCore/platform/AtomicString.cpp
 +++ b/src/3rdparty/webkit/WebCore/platform/AtomicString.cpp
 @@ -104,7 +104,7 @@
@@ -122,8 +112,6 @@
          const UChar* strChars = str->characters();
          const UChar* bufChars = buf.s;
  
-Index: b/src/3rdparty/webkit/WebCore/platform/StringHash.h
-===================================================================
 --- a/src/3rdparty/webkit/WebCore/platform/StringHash.h
 +++ b/src/3rdparty/webkit/WebCore/platform/StringHash.h
 @@ -44,6 +44,15 @@

Modified: trunk/packages/qt4-x11/debian/patches/72_generic_arch_atomic_header_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/72_generic_arch_atomic_header_fix.diff	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/72_generic_arch_atomic_header_fix.diff	2008-08-02 22:12:48 UTC (rev 11838)
@@ -2,8 +2,6 @@
 
 This mostly affects hppa, but hppa is "community supported" - meaning that the Trolls doesn't care much.
 
-Index: b/src/corelib/arch/qatomic_generic.h
-===================================================================
 --- a/src/corelib/arch/qatomic_generic.h
 +++ b/src/corelib/arch/qatomic_generic.h
 @@ -223,7 +223,7 @@

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-08-02 19:50:30 UTC (rev 11837)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-08-02 22:12:48 UTC (rev 11838)
@@ -1,6 +1,6 @@
 # patches from upstream
-0002_https_lowercase.cpp
-0003_tab_text_cutoff.diff
+0002_https_lowercase.diff
+
 # qt-copy patches
 0167-fix-group-reading.diff
 0180-window-role.diff
@@ -18,6 +18,8 @@
 0234-fix-mysql-threaded.diff
 0235-qdbus-dispatch-async-timeout.diff
 0236-qtoolbararealayout-restore.diff
+0238-fix-qt-qttabbar-size.diff
+0241-fix-null-stylesheet-warning.diff
 
 # debian patches
 01_qmake_for_debian.diff

More information about the pkg-kde-commits mailing list