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

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-11-09 14:10:03 +0000 (Fri, 09 Nov 2007)
New Revision: 7833

Added:
   trunk/packages/qt4-x11/debian/patches/0197-fix-qstylesheetstyle.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
Log:
* Add stylesheet style patch.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2007-11-09 13:13:54 UTC (rev 7832)
+++ trunk/packages/qt4-x11/debian/changelog	2007-11-09 14:10:03 UTC (rev 7833)
@@ -8,8 +8,11 @@
   [Fathi Boudra]
 
   * Merge Kubuntu load ssl patch. Thanks to Jonathan Riddell.
-  * Add qt-copy patch: 0196-q3toolbar-clean-rebuild.
-    It fixes crash when we clear q3toolbar and rebuild it.
+  * Add qt-copy patch:
+    * 0196-q3toolbar-clean-rebuild.
+      It fixes crash when we clear q3toolbar and rebuild it.
+    * 0197-qstylesheetstyle.
+      it fixes stylesheet style: e.g. klineedits looking wrong under oxygen.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 06 Nov 2007 09:20:21 +0100
 

Added: trunk/packages/qt4-x11/debian/patches/0197-fix-qstylesheetstyle.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0197-fix-qstylesheetstyle.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0197-fix-qstylesheetstyle.diff	2007-11-09 14:10:03 UTC (rev 7833)
@@ -0,0 +1,45 @@
+qt-bugs@ issue : none
+bugs.kde.org number : none
+applied: yes
+author: TrollTech
+
+it is a patch from Girish Ramakrishnan <girish at trolltech.com>
+fixes eg klineedits looking wrong under oxygen.
+
+--- a/src/gui/styles/qstylesheetstyle.cpp
++++ b/src/gui/styles/qstylesheetstyle.cpp
+@@ -1433,28 +1433,28 @@
+ 
+ #ifndef QT_NO_SPINBOX
+     if (qobject_cast<const QAbstractSpinBox *>(w))
+-        return base->pixelMetric(QStyle::PM_SpinBoxFrameWidth);
++        return base->pixelMetric(QStyle::PM_SpinBoxFrameWidth, 0, w);
+ #endif
+ 
+ #ifndef QT_NO_COMBOBOX
+     if (qobject_cast<const QComboBox *>(w))
+-        return base->pixelMetric(QStyle::PM_ComboBoxFrameWidth);
++        return base->pixelMetric(QStyle::PM_ComboBoxFrameWidth, 0, w);
+ #endif
+ 
+ #ifndef QT_NO_MENU
+     if (qobject_cast<const QMenu *>(w))
+-        return base->pixelMetric(QStyle::PM_MenuPanelWidth);
++        return base->pixelMetric(QStyle::PM_MenuPanelWidth, 0, w);
+ #endif
+ 
+ #ifndef QT_NO_MENUBAR
+     if (qobject_cast<const QMenuBar *>(w))
+-        return base->pixelMetric(QStyle::PM_MenuBarPanelWidth);
++        return base->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, w);
+ #endif
+ 
+     if (QString::fromLatin1(w->metaObject()->className()) == QLatin1String("QTipLabel"))
+-        return base->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth);
++        return base->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth, 0, w);
+ 
+-    return base->pixelMetric(QStyle::PM_DefaultFrameWidth);
++    return base->pixelMetric(QStyle::PM_DefaultFrameWidth, 0, w);
+ }
+ 
+ static int pseudoClass(QStyle::State state)