diff --git a/applets/systemtray/package/contents/applet/CompactApplet.qml b/applets/systemtray/package/contents/applet/CompactApplet.qml --- a/applets/systemtray/package/contents/applet/CompactApplet.qml +++ b/applets/systemtray/package/contents/applet/CompactApplet.qml @@ -28,7 +28,6 @@ objectName: "org.kde.desktop-CompactApplet" anchors.fill: parent - icon: plasmoid.icon mainText: plasmoid.toolTipMainText subText: plasmoid.toolTipSubText location: if (plasmoid.parent && plasmoid.parent.inHiddenLayout && plasmoid.location !== PlasmaCore.Types.LeftEdge) { diff --git a/applets/systemtray/package/contents/ui/items/PlasmoidItem.qml b/applets/systemtray/package/contents/ui/items/PlasmoidItem.qml --- a/applets/systemtray/package/contents/ui/items/PlasmoidItem.qml +++ b/applets/systemtray/package/contents/ui/items/PlasmoidItem.qml @@ -29,7 +29,6 @@ itemId: applet ? applet.pluginName : "" mainText: applet ? applet.toolTipMainText : "" subText: applet ? applet.toolTipSubText : "" - icon: applet ? applet.icon : "" mainItem: applet && applet.toolTipItem ? applet.toolTipItem : null textFormat: applet ? applet.toolTipTextFormat : "" active: root.activeApplet !== applet diff --git a/applets/systemtray/package/contents/ui/items/StatusNotifierItem.qml b/applets/systemtray/package/contents/ui/items/StatusNotifierItem.qml --- a/applets/systemtray/package/contents/ui/items/StatusNotifierItem.qml +++ b/applets/systemtray/package/contents/ui/items/StatusNotifierItem.qml @@ -27,7 +27,6 @@ text: model.Title mainText: model.ToolTipTitle !== "" ? model.ToolTipTitle : model.Title subText: model.ToolTipSubTitle - icon: model.ToolTipIcon !== "" ? model.ToolTipIcon : model.Icon ? model.Icon : model.IconName textFormat: Text.AutoText PlasmaCore.IconItem { diff --git a/applets/systemtray/systemtraymodel.h b/applets/systemtray/systemtraymodel.h --- a/applets/systemtray/systemtraymodel.h +++ b/applets/systemtray/systemtraymodel.h @@ -104,7 +104,6 @@ Title, TitleChanged, ToolTipChanged, - ToolTipIcon, ToolTipSubTitle, ToolTipTitle, WindowId diff --git a/applets/systemtray/systemtraymodel.cpp b/applets/systemtray/systemtraymodel.cpp --- a/applets/systemtray/systemtraymodel.cpp +++ b/applets/systemtray/systemtraymodel.cpp @@ -264,7 +264,6 @@ roles.insert(static_cast(Role::Title), QByteArrayLiteral("Title")); roles.insert(static_cast(Role::TitleChanged), QByteArrayLiteral("TitleChanged")); roles.insert(static_cast(Role::ToolTipChanged), QByteArrayLiteral("ToolTipChanged")); - roles.insert(static_cast(Role::ToolTipIcon), QByteArrayLiteral("ToolTipIcon")); roles.insert(static_cast(Role::ToolTipSubTitle), QByteArrayLiteral("ToolTipSubTitle")); roles.insert(static_cast(Role::ToolTipTitle), QByteArrayLiteral("ToolTipTitle")); roles.insert(static_cast(Role::WindowId), QByteArrayLiteral("WindowId")); @@ -355,7 +354,6 @@ updateItemData(dataItem, data, Role::Title); updateItemData(dataItem, data, Role::TitleChanged); updateItemData(dataItem, data, Role::ToolTipChanged); - updateItemData(dataItem, data, Role::ToolTipIcon); updateItemData(dataItem, data, Role::ToolTipSubTitle); updateItemData(dataItem, data, Role::ToolTipTitle); updateItemData(dataItem, data, Role::WindowId); diff --git a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp --- a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp +++ b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp @@ -103,7 +103,6 @@ setData(QStringLiteral("TitleChanged"), false); setData(QStringLiteral("Title"), QString()); setData(QStringLiteral("ToolTipChanged"), false); - setData(QStringLiteral("ToolTipIcon"), QString()); setData(QStringLiteral("ToolTipSubTitle"), QString()); setData(QStringLiteral("ToolTipTitle"), QString()); setData(QStringLiteral("WindowId"), QVariant()); @@ -339,21 +338,6 @@ if (toolTip.title.isEmpty()) { setData(QStringLiteral("ToolTipTitle"), QString()); setData(QStringLiteral("ToolTipSubTitle"), QString()); - setData(QStringLiteral("ToolTipIcon"), QString()); - } else { - QIcon toolTipIcon; - if (toolTip.image.size() == 0) { - toolTipIcon = QIcon(new KIconEngine(toolTip.icon, iconLoader())); - } else { - toolTipIcon = imageVectorToPixmap(toolTip.image); - } - setData(QStringLiteral("ToolTipTitle"), toolTip.title); - setData(QStringLiteral("ToolTipSubTitle"), toolTip.subTitle); - if (toolTipIcon.isNull() || toolTipIcon.availableSizes().isEmpty()) { - setData(QStringLiteral("ToolTipIcon"), QString()); - } else { - setData(QStringLiteral("ToolTipIcon"), toolTipIcon); - } } }