rpms/kdebase-workspace/devel kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch, NONE, 1.1 kdebase-workspace.spec, 1.360, 1.361

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18439/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch 
Log Message:
* Tue Feb 02 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.98-3
- support the widgetStyle4 hack in the Qt KDE platform plugin

kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch:
 qguiplatformplugin_kde.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch ---
diff -ur kdebase-workspace-4.3.98/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp kdebase-workspace-4.3.98-platformplugin-widgetstyle4/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
--- kdebase-workspace-4.3.98/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp	2009-12-17 17:35:19.000000000 +0100
+++ kdebase-workspace-4.3.98-platformplugin-widgetstyle4/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp	2010-02-02 01:24:26.000000000 +0100
@@ -159,7 +159,7 @@
     {
         const QString defaultStyle = KStyle::defaultStyle();
         const KConfigGroup pConfig(KGlobal::config(), "General");
-        return pConfig.readEntry("widgetStyle", defaultStyle);
+        return pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
     }
     virtual QPalette palette()
     {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -p -r1.360 -r1.361
--- kdebase-workspace.spec	1 Feb 2010 12:45:18 -0000	1.360
+++ kdebase-workspace.spec	2 Feb 2010 00:28:50 -0000	1.361
@@ -22,7 +22,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.3.98
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -51,6 +51,8 @@ Patch16: kdebase-workspace-4.3.98-batter
 Patch17: kdebase-workspace-4.3.75-classicmenu-logout.patch
 Patch19: kdebase-workspace-4.3.4-kdm_plymouth.patch
 Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
+# support the widgetStyle4 hack in the Qt KDE platform plugin
+Patch21: kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -297,6 +299,7 @@ Requires: akonadi
 %patch19 -p1 -b .kdm_plymouth
 %endif
 %patch20 -p1 -b .xsession_errors_O_APPEND
+%patch21 -p1 -b .platformplugin-widgetstyle4
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -649,6 +652,9 @@ fi
 
 
 %changelog
+* Tue Feb 02 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.98-3
+- support the widgetStyle4 hack in the Qt KDE platform plugin
+
 * Mon Feb 01 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.98-2
 - rebase battery-plasmoid-showremainingtime patch and remove references to 4.2