Temporary workaround, QIcon::name() will be in final Qt 4.7 - fixed
This commit is contained in:
parent
6303109147
commit
7e816424a9
|
@ -1,7 +1,7 @@
|
||||||
diff -up kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47 kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp
|
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.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
|
+++ kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp 2010-05-21 22:50:44.819211510 +0200
|
||||||
@@ -65,12 +65,6 @@ protected:
|
@@ -65,14 +65,7 @@ protected:
|
||||||
virtual QString iconNameForAction(QAction *action)
|
virtual QString iconNameForAction(QAction *action)
|
||||||
{
|
{
|
||||||
KIcon icon(action->icon());
|
KIcon icon(action->icon());
|
||||||
|
@ -12,5 +12,7 @@ diff -up kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt
|
||||||
- return icon.isNull() ? QString() : icon.name();
|
- return icon.isNull() ? QString() : icon.name();
|
||||||
-#else
|
-#else
|
||||||
return QString();
|
return QString();
|
||||||
#endif
|
-#endif
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue