rpms/qt4/F-8 qt-x11-fix-combobox-window-type.patch, NONE, 1.1 qt4.spec, 1.77, 1.78

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21330

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-fix-combobox-window-type.patch 
Log Message:
* Mon Jun 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.5-2
- fix-combobox-window-type patch (maniac103)


qt-x11-fix-combobox-window-type.patch:

--- NEW FILE qt-x11-fix-combobox-window-type.patch ---
--- src/gui/widgets/qcombobox.cpp.orig	2008-06-05 09:29:49.000000000 +0200
+++ src/gui/widgets/qcombobox.cpp	2008-06-05 09:30:56.000000000 +0200
@@ -339,10 +339,6 @@
             combo->update();
         }
     }
-#ifdef Q_WS_X11
-    x11SetWindowType( X11WindowTypeCombo );
-    x11SetWindowTransient( combo->topLevelWidget());
-#endif
 }
 
 void QComboBoxPrivateContainer::resizeEvent(QResizeEvent *e)
@@ -419,6 +415,11 @@
     layout->insertSpacing(0, 0);
     layout->addSpacing(0);
     updateTopBottomMargin();
+
+#ifdef Q_WS_X11
+    x11SetWindowType(X11WindowTypeCombo);
+    x11SetWindowTransient(combo->topLevelWidget());
+#endif
 }
 
 void QComboBoxPrivateContainer::scrollItemView(int action)


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- qt4.spec	4 Jun 2008 17:46:16 -0000	1.77
+++ qt4.spec	18 Jun 2008 03:40:31 -0000	1.78
@@ -8,7 +8,7 @@
 Name:    qt4
 %endif
 Version: 4.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -40,6 +40,8 @@
 Patch7: qt4-sparc64-qvector.patch
 # kill hardcoded font substitutions (#447298)
 Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
+# 
+Patch9: qt-x11-fix-combobox-window-type.patch
 
 ## qt-copy patches
 %define qt_copy 20080528
@@ -289,6 +291,7 @@
 %endif
 %patch7 -p1 -b .sparc64
 %patch8 -p1 -b .font-aliases
+%patch9 -p0 -b .fix-combobox-window-type
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -704,6 +707,9 @@
 
 
 %changelog
+* Mon Jun 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.5-2
+- fix-combobox-window-type patch (maniac103)
+
 * Wed May 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.5-1
 - qt-x11-opensource-src-4.3.5
 - qt-copy 20080528 patches