OSDN Git Service
(root)
/
kde
/
libdbusmenu-qt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
assume QIcon::name() is available
[kde/libdbusmenu-qt.git]
/
src
/
dbusmenuexporter.cpp
diff --git
a/src/dbusmenuexporter.cpp
b/src/dbusmenuexporter.cpp
index
eb06204
..
275ff59
100644
(file)
--- a/
src/dbusmenuexporter.cpp
+++ b/
src/dbusmenuexporter.cpp
@@
-31,7
+31,6
@@
#include <QWidgetAction>
// Local
#include <QWidgetAction>
// Local
-#include "dbusmenu_config.h"
#include "dbusmenu_p.h"
#include "dbusmenuexporterdbus_p.h"
#include "dbusmenuexporterprivate_p.h"
#include "dbusmenu_p.h"
#include "dbusmenuexporterdbus_p.h"
#include "dbusmenuexporterprivate_p.h"
@@
-468,12
+467,10
@@
void DBusMenuExporter::doEmitLayoutUpdated()
QString DBusMenuExporter::iconNameForAction(QAction *action)
{
DMRETURN_VALUE_IF_FAIL(action, QString());
QString DBusMenuExporter::iconNameForAction(QAction *action)
{
DMRETURN_VALUE_IF_FAIL(action, QString());
-#ifdef HAVE_QICON_NAME
QIcon icon = action->icon();
if (action->isIconVisibleInMenu() && !icon.isNull()) {
return icon.name();
}
QIcon icon = action->icon();
if (action->isIconVisibleInMenu() && !icon.isNull()) {
return icon.name();
}
-#endif
return QString();
}
return QString();
}