icon-name patch removed

This commit is contained in:
Jaroslav Reznik 2010-08-05 14:42:47 +02:00
parent 7651fb1201
commit 1960ce8853
2 changed files with 0 additions and 22 deletions

View File

@ -1,18 +0,0 @@
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:50:44.819211510 +0200
@@ -65,14 +65,7 @@ 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
}
};

View File

@ -76,9 +76,6 @@ 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.90-icon-name-qt47.patch
# upstreamable
@ -230,7 +227,6 @@ format for easy browsing.
%patch24 -p1 -b .drkonq
%endif
%patch27 -p1 -b .no_rpath
#patch28 -p1 -b .icon-name-qt47
# upstreamable patches