rpms/kdelibs/devel kdelibs-4.4.80-icon-name-qt47.patch, NONE, 1.1 kdelibs.spec, 1.627, 1.628

[Jaroslav Reznik]

Author: jreznik

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29532

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.4.80-icon-name-qt47.patch 
Log Message:
Temporary workaround, QIcon::name() will be in final Qt 4.7

kdelibs-4.4.80-icon-name-qt47.patch:
 kstatusnotifieritem.cpp |    6 ------
 1 file changed, 6 deletions(-)

--- NEW FILE kdelibs-4.4.80-icon-name-qt47.patch ---
diff -up kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47 kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp
--- kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47	2010-05-16 22:04:05.000000000 +0200
+++ kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp	2010-05-21 22:31:44.241210832 +0200
@@ -65,12 +65,6 @@ protected:
     virtual QString iconNameForAction(QAction *action)
     {
         KIcon icon(action->icon());
-#if QT_VERSION >= 0x040700
-        // QIcon::name() is in the 4.7 git branch, but it is not in 4.7 TP.
-        // If you get a build error here, you need to update your pre-release
-        // of Qt 4.7.
-        return icon.isNull() ? QString() : icon.name();
-#else
         return QString();
 #endif
     }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -p -r1.627 -r1.628
--- kdelibs.spec	21 May 2010 15:20:58 -0000	1.627
+++ kdelibs.spec	21 May 2010 20:34:14 -0000	1.628
@@ -78,6 +78,9 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # paths (like /usr/lib64) already! With this, we can drop
 # -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
 Patch27: kdelibs-4.4.80-no_rpath.patch
+# TEMPORARY WORKAROUND! QIcon::name() does not exists in Qt 4.7 TP
+# TODO: remove by final Qt 4.7!!!
+Patch28: kdelibs-4.4.80-icon-name-qt47.patch
 
 # upstreamable
 
@@ -231,6 +234,7 @@ format for easy browsing.
 %patch24 -p1 -b .drkonq
 %endif
 %patch27 -p1 -b .no_rpath
+%patch28 -p1 -b .icon-name-qt47
 
 # upstreamable patches