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

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-11-10 22:41:14 +0000 (Sat, 10 Nov 2007)
New Revision: 7849

Added:
   trunk/packages/qt4-x11/debian/patches/0198-fix-qstylesheetstyle2.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
* Add 0198-qstylesheetstyle2 patch:
  it fixes stylesheet style: e.g. kcombobox with a clean button.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2007-11-10 15:18:53 UTC (rev 7848)
+++ trunk/packages/qt4-x11/debian/changelog	2007-11-10 22:41:14 UTC (rev 7849)
@@ -1,4 +1,4 @@
-qt4-x11 (4.3.2-2) UNRELEASED; urgency=low
+qt4-x11 (4.3.2-2) unstable; urgency=low
 
   [Adeodato Simó]
 
@@ -13,6 +13,8 @@
       It fixes crash when we clear q3toolbar and rebuild it.
     * 0197-qstylesheetstyle.
       it fixes stylesheet style: e.g. klineedits looking wrong under oxygen.
+    * 0198-qstylesheetstyle2.
+      it fixes stylesheet style: e.g. kcombobox with a clean button.
 
  -- 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/0198-fix-qstylesheetstyle2.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0198-fix-qstylesheetstyle2.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0198-fix-qstylesheetstyle2.diff	2007-11-10 22:41:14 UTC (rev 7849)
@@ -0,0 +1,38 @@
+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 kcombobox with a clean button
+
+--- a/src/gui/styles/default.qss
++++ b/src/gui/styles/default.qss
+@@ -11,6 +11,10 @@
+     -qt-style-features: background-color;
+ }
+ 
++QLineEdit:no-frame {
++    border: none;
++}
++
+ QFrame {
+     border: native;
+ }
+--- a/src/gui/styles/qstylesheetstyle.cpp
++++ b/src/gui/styles/qstylesheetstyle.cpp
+@@ -1738,8 +1738,13 @@
+ #endif // QT_NO_TOOLBOX
+ #ifndef QT_NO_LINEEDIT
+         // LineEdit sets Sunken flag to indicate Sunken frame (argh)
+-        if (qobject_cast<const QLineEdit *>(w)) {
++        if (const QLineEdit *lineEdit = qobject_cast<const QLineEdit *>(w)) {
+             state &= ~QStyle::State_Sunken;
++            if (lineEdit->frame()) {
++                extraClass &= ~PseudoClass_Frameless;
++            } else {
++                extraClass |= PseudoClass_Frameless;
++            }
+         } else
+ #endif
+         { } // required for the above ifdef'ery

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2007-11-10 15:18:53 UTC (rev 7848)
+++ trunk/packages/qt4-x11/debian/patches/series	2007-11-10 22:41:14 UTC (rev 7849)
@@ -17,6 +17,7 @@
 0195-compositing-properties.diff
 0196-q3toolbar-clean-rebuild.diff
 0197-fix-qstylesheetstyle.diff
+0198-fix-qstylesheetstyle2.diff
 
 # debian patches
 01_qmake_for_debian.diff