summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-03-21 17:29:56 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-03-21 17:29:56 +0100
commitd5b01ef76733ee348536597058e67f6096eac312 (patch)
treedd2897de15bf6c8c1326791dd8427c5b6fea6dcc /kde-plasma
parentkde-plasma: Drop KDE Plasma 5.9.3 (diff)
downloadgentoo-d5b01ef76733ee348536597058e67f6096eac312.tar.gz
gentoo-d5b01ef76733ee348536597058e67f6096eac312.tar.bz2
gentoo-d5b01ef76733ee348536597058e67f6096eac312.zip
kde-plasma: Drop unused patches
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/khotkeys/files/khotkeys-5.8.5-kf-5.31.patch39
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch45
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-crashfix.patch57
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-folder-view-script-execution.patch28
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-hover-state.patch33
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-taskman-memleak.patch43
-rw-r--r--kde-plasma/plasma-integration/files/plasma-integration-5.8.5-filedialog.patch71
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch177
8 files changed, 0 insertions, 493 deletions
diff --git a/kde-plasma/khotkeys/files/khotkeys-5.8.5-kf-5.31.patch b/kde-plasma/khotkeys/files/khotkeys-5.8.5-kf-5.31.patch
deleted file mode 100644
index 6b2d7c79be6..00000000000
--- a/kde-plasma/khotkeys/files/khotkeys-5.8.5-kf-5.31.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 617de4bd3fd080d43cce9bdc8af82963960d5c3a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Wed, 18 Jan 2017 11:40:10 +0100
-Subject: Fix build with -fno-operator-names
-
----
- kcm_hotkeys/hotkeys_model.cpp | 2 +-
- libkhotkeysprivate/action_data/action_data_group.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kcm_hotkeys/hotkeys_model.cpp b/kcm_hotkeys/hotkeys_model.cpp
-index 66ea747..8703f83 100644
---- a/kcm_hotkeys/hotkeys_model.cpp
-+++ b/kcm_hotkeys/hotkeys_model.cpp
-@@ -486,7 +486,7 @@ QMimeData *KHotkeysModel::mimeData(const QModelIndexList &indexes) const
-
- Q_FOREACH (const QModelIndex &index, indexes)
- {
-- if (index.isValid() and index.column() == 0)
-+ if (index.isValid() && index.column() == 0)
- {
- KHotKeys::ActionDataBase *element = indexToActionDataBase(index);
- // We use the pointer as id.
-diff --git a/libkhotkeysprivate/action_data/action_data_group.cpp b/libkhotkeysprivate/action_data/action_data_group.cpp
-index ddbe24e..f80f775 100644
---- a/libkhotkeysprivate/action_data/action_data_group.cpp
-+++ b/libkhotkeysprivate/action_data/action_data_group.cpp
-@@ -83,7 +83,7 @@ Trigger::TriggerTypes ActionDataGroup::allowedTriggerTypes() const
-
- bool ActionDataGroup::is_system_group() const
- {
-- return _system_group != SYSTEM_NONE and _system_group != SYSTEM_ROOT;
-+ return _system_group != SYSTEM_NONE && _system_group != SYSTEM_ROOT;
- }
-
-
---
-cgit v0.11.2
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch
deleted file mode 100644
index 86fc43c502c..00000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 00cdef0f2b6e8e20661aef98074b8533103bbfdd
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu Sep 15 00:39:43 2016 +0200
-
- Make KF5Baloo optional
-
- https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f15021a..613ca20 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,14 +67,10 @@ set_package_properties(PackageKitQt5 PROPERTIES DESCRIPTION "Software Manager in
- PURPOSE "Provides package management integration to the application launcher."
- )
-
--# Baloo is currently part of the KF5 namespace, but it is not
--# a proper framework. Hence the strange versioning.
--# This will be fixed with Plasma 5.2, as Baloo should have
--# become a framework by then
--find_package(KF5Baloo "5.1.90")
-+find_package(KF5Baloo)
- set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
-- TYPE REQUIRED
-- PURPOSE "Needed to build to File Search KCM"
-+ TYPE OPTIONAL
-+ PURPOSE "Needed to build the File Search KCM"
- )
-
- find_package(Fontconfig)
-diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
-index 53ca49a..3220bd3 100644
---- a/kcms/CMakeLists.txt
-+++ b/kcms/CMakeLists.txt
-@@ -55,7 +55,9 @@ add_subdirectory(useraccount/pics)
-
-
- add_subdirectory(workspaceoptions)
--add_subdirectory(baloo)
-+if (KF5Baloo_FOUND)
-+ add_subdirectory(baloo)
-+endif()
- add_subdirectory(solid_actions)
- add_subdirectory(cursortheme)
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-crashfix.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-crashfix.patch
deleted file mode 100644
index 9e4bdd99f5c..00000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-crashfix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit d674ede6e5f22281fa2461546ddc25ff5f3a7015
-Author: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Tue Jan 3 09:38:50 2017 +0100
-
- [Panel Containment] Explicitly bind visible on both the container and the applet
-
- While trying to fix a random plasmashell crash I was getting fairly often (and I hoped
- was fixed by David's last spacer fix) I found that the cause was actually in virtual desktop pager.
-
- The virtual desktop pager is hidden when there's just one desktop and it will not update its
- models in this case to save resources. Back when I added this I already noticed that sometimes
- the pager (usually after one "open and close panelcontroller" cycle) still thought it was visible.
- It was even weirder than that, I found out that on teardown it suddenly thought it became visible.
- This had it populate its model which in turn spawned QML items, all of this whilst the panel was
- already in the process of destroying its children, leading to a crash.
-
- Differential Revision: https://phabricator.kde.org/D3897
-
-diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
-index e9afa86..5bb5283 100644
---- a/containments/panel/contents/ui/main.qml
-+++ b/containments/panel/contents/ui/main.qml
-@@ -54,20 +54,27 @@ DragDrop.DropArea {
-
- //BEGIN functions
- function addApplet(applet, x, y) {
-+ // don't show applet if it choses to be hidden but still make it
-+ // accessible in the panelcontroller
-+ // Due to the nature of how "visible" propagates in QML, we need to
-+ // explicitly set it on the container (so the Layout ignores it)
-+ // as well as the applet (so it reliably knows about), otherwise it can
-+ // happen that an applet erroneously thinks it's visible, or suddenly
-+ // starts thinking that way on teardown (virtual desktop pager)
-+ // leading to crashes
-+ var visibleBinding = Qt.binding(function() {
-+ return applet.status !== PlasmaCore.Types.HiddenStatus || (!plasmoid.immutable && plasmoid.userConfiguring);
-+ })
-+
- var container = appletContainerComponent.createObject(root, {
- applet: applet,
--
-- // don't show applet if it choses to be hidden but still make it
-- // accessible in the panelcontroller
-- visible: Qt.binding(function() {
-- return applet.status !== PlasmaCore.Types.HiddenStatus || (!plasmoid.immutable && plasmoid.userConfiguring)
-- })
-+ visible: visibleBinding
- });
-
- applet.parent = container;
- applet.anchors.fill = container;
-
-- applet.visible = true;
-+ applet.visible = visibleBinding;
-
- // Is there a DND placeholder? Replace it!
- if (dndSpacer.parent === currentLayout) {
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-folder-view-script-execution.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-folder-view-script-execution.patch
deleted file mode 100644
index d8376d87d5c..00000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-folder-view-script-execution.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 771e57f3b2c19f4e6f867c01c2457ec87531b4cf
-Author: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Tue Jan 31 15:07:42 2017 +0100
-
- [Folder View] show script execution prompt when clicking item
-
- When clicking a file in FolderView, we should ask for whether to open or run a script depending on user settings.
- This is what Dolphin does.
-
- BUG: 375793
- FIXED-IN: 5.8.6
-
- Differential Revision: https://phabricator.kde.org/D4367
-
-diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp
-index 758f7f35..1ba12450 100644
---- a/containments/desktop/plugins/folder/foldermodel.cpp
-+++ b/containments/desktop/plugins/folder/foldermodel.cpp
-@@ -509,7 +509,8 @@ void FolderModel::run(int row)
- url.setScheme(QStringLiteral("file"));
- }
-
-- new KRun(url, 0);
-+ KRun *run = new KRun(url, 0);
-+ run->setShowScriptExecutionPrompt(true);
- }
-
- void FolderModel::rename(int row, const QString& name)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-hover-state.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-hover-state.patch
deleted file mode 100644
index 5e645c51b06..00000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-hover-state.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit e80a4b87cfa98708724942794ca6f051974bb5c0
-Author: Eike Hein <hein@kde.org>
-Date: Tue Jan 3 16:30:54 2017 +0900
-
- Don't clear hover state while a child dialog is open.
-
- Otherwise it won't stay open.
-
- Fixes regression from 7585f295363532eff51f7e11ef6b62925117aba4.
-
- The bug number referenced in the original change is invalid, but
- I don't think this should invalidate the intent of that fix. Kai
- please let me know the correct bug number so I can double-check.
-
- BUG:374291
- CCMAIL:kde@privat.broulik.de
-
-diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
-index 1fd8dbb..8936532 100644
---- a/containments/desktop/package/contents/ui/FolderView.qml
-+++ b/containments/desktop/package/contents/ui/FolderView.qml
-@@ -343,7 +343,10 @@ Item {
- onContainsMouseChanged: {
- if (!containsMouse && !main.rubberBand) {
- clearPressState();
-- gridView.hoveredItem = null;
-+
-+ if (gridView.hoveredItem && !gridView.hoveredItem.popupDialog) {
-+ gridView.hoveredItem = null;
-+ }
- }
- }
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-taskman-memleak.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-taskman-memleak.patch
deleted file mode 100644
index b112edced77..00000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-taskman-memleak.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 58e932c607db27bea2872625661991fb16c79d13
-Author: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Tue Jan 3 09:37:38 2017 +0100
-
- [Task Manager] Parent QAction to "parent" instead of this
-
- This ensures the QAction is disposed of once the menu gets destroyed rather than
- accumulating forever - the methods already took a "parent" argument,
- which is passed the menu from QML side, for exactly that purpose.
-
- Differential Revision: https://phabricator.kde.org/D3816
-
-diff --git a/applets/taskmanager/plugin/backend.cpp b/applets/taskmanager/plugin/backend.cpp
-index 16f1f57..efbd095 100644
---- a/applets/taskmanager/plugin/backend.cpp
-+++ b/applets/taskmanager/plugin/backend.cpp
-@@ -142,7 +142,7 @@ QVariantList Backend::jumpListActions(const QUrl &launcherUrl, QObject *parent)
- continue;
- }
-
-- QAction *action = new QAction(this);
-+ QAction *action = new QAction(parent);
- action->setText(name);
- action->setIcon(QIcon::fromTheme(actionGroup.readEntry("Icon")));
- action->setProperty("exec", exec);
-@@ -204,7 +204,7 @@ QVariantList Backend::recentDocumentActions(const QUrl &launcherUrl, QObject *pa
- continue;
- }
-
-- QAction *action = new QAction(this);
-+ QAction *action = new QAction(parent);
- action->setText(url.fileName());
- action->setIcon(QIcon::fromTheme(fileItem.iconName(), QIcon::fromTheme("unknown")));
- action->setProperty("agent", storageId);
-@@ -219,7 +219,7 @@ QVariantList Backend::recentDocumentActions(const QUrl &launcherUrl, QObject *pa
- }
-
- if (actionCount > 0) {
-- QAction *action = new QAction(this);
-+ QAction *action = new QAction(parent);
- action->setText(i18n("Forget Recent Documents"));
- action->setProperty("agent", storageId);
- connect(action, &QAction::triggered, this, &Backend::handleRecentDocumentAction);
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.8.5-filedialog.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.8.5-filedialog.patch
deleted file mode 100644
index 148825d496d..00000000000
--- a/kde-plasma/plasma-integration/files/plasma-integration-5.8.5-filedialog.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-commit 87b27476cc8a3865994da066ce06a3e836462719
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Dec 31 11:55:43 2016 +0100
-
- Fix regression in which the Save dialog appears as an Open dialog
-
- 7bbbd93cd3fc0abdffd3fa7f144cb50a33fafad9 makes the save dialog appear as Open dialog.
-
- Simplify the code in that commit so it does not regress anymore.
-
- Comes with a unit test
-
- New test fails without the patch, works with it. Kate Save As dialog no longer shows as Open dialog.
-
- REVIEW: 129732
-
-diff --git a/autotests/kfiledialog_unittest.cpp b/autotests/kfiledialog_unittest.cpp
-index 47a5543..d53c7e3 100644
---- a/autotests/kfiledialog_unittest.cpp
-+++ b/autotests/kfiledialog_unittest.cpp
-@@ -95,6 +95,29 @@ private Q_SLOTS:
- QCOMPARE(dialog.directoryUrl(), directoryUrl);
- }
-
-+ void testGetSaveFileUrl()
-+ {
-+ QObject lambdaGuard;
-+ QTemporaryFile tempFile(QDir::tempPath()+"/kfiledialogtest_XXXXXX");
-+ tempFile.open();
-+ const QString tempName = tempFile.fileName();
-+ const QUrl url = QUrl::fromLocalFile(tempName);
-+
-+ // Need to use a lambda and not just QTest::qWaitForWindowExposed();
-+ // because with the static getSaveFileUrl we do not have access
-+ // to the QFileDialog object, so instead we hook to a signal
-+ KFileWidget::OperationMode saveFileOperationMode = KFileWidget::Other;
-+ connect(qApp, &QGuiApplication::focusWindowChanged, &lambdaGuard, [&saveFileOperationMode] {
-+ KFileWidget *fileWidget = findFileWidget();
-+ saveFileOperationMode = fileWidget->operationMode();
-+ qApp->activeWindow()->close();
-+ });
-+
-+ QFileDialog::getSaveFileUrl(0, QString(), url);
-+
-+ QCOMPARE(saveFileOperationMode, KFileWidget::Saving);
-+ }
-+
- void testViewMode()
- {
- // Open a file dialog, and change view mode to tree
-diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp
-index 990b983..05cfe35 100644
---- a/src/platformtheme/kdeplatformfiledialoghelper.cpp
-+++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp
-@@ -365,15 +365,7 @@ void KDEPlatformFileDialogHelper::selectFile(const QUrl &filename)
- // Qt 5 at least <= 5.8.0 does not derive the directory from the passed url
- // and set the initialDirectory option accordingly, also not for known schemes
- // like file://, so we have to do it ourselves
--
-- // Syntax-wise we have to use a copy ctor until Qt 5.7.x and clone() since Qt 5.8.
--#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
-- QSharedPointer<QFileDialogOptions> opt(new QFileDialogOptions(*options()));
--#else
-- auto opt = options()->clone();
--#endif
-- opt->setInitialDirectory(m_dialog->directory());
-- setOptions(opt);
-+ options()->setInitialDirectory(m_dialog->directory());
- }
-
- void KDEPlatformFileDialogHelper::setDirectory(const QUrl &directory)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch
deleted file mode 100644
index fada32758f1..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From: Lindsay Roberts <m@lindsayr.com>
-Date: Mon, 10 Oct 2016 16:55:49 +0000
-Subject: Systray: Move all icon resolution to dataengine
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=749f60b89f4a166833fb64a5b593a801f63f9615
----
-Systray: Move all icon resolution to dataengine
-
-Summary:
-Changes triggered by investigation into a long-running high CPU usage bug with system tray animations. The systray itself had icon name to icon resolution code, which was being triggered (twice) for every icon, every time any icon in the systray was updated. This code was spinning up a KIconLoader on each of these instances, and throwing it directly away. Each one triggered a large quantity of memory allocations and disk scans.
-
-This patch moves the extra bit of "appName" logic from the native part of the system tray to the statusnotifieritem datasource, which already had a stored 'customIconLoader' to handle icon theme paths, and removes the special lookup from the sytemtray applet completely. It also prefers icons provided by the dataengine to doing another lookup (contentious?). This removes all the extra CPU usage outside of the QML scene graph and graphics drivers locally.
-
-This is very much a looking for feedback item - there are things about the icon loading paths I almost certainly haven't appreciated yet, and perhaps preferring loading by icon name in the applet has a another purpose.
-
-BUG: 356479
-
-Test Plan: Have tested locally with kgpg and steam, the two apps I have that trigger the old code path. In neither case, however, did the appName logic produce a different result to the code with just the icon search path in statusnotifieritem.
-
-Reviewers: #plasma, davidedmundson, mart
-
-Reviewed By: #plasma, davidedmundson, mart
-
-Subscribers: davidedmundson, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D2986
----
-
-
---- a/applets/systemtray/package/contents/ui/ConfigEntries.qml
-+++ b/applets/systemtray/package/contents/ui/ConfigEntries.qml
-@@ -75,7 +75,7 @@
- "index": i,
- "taskId": item.Id,
- "name": item.Title,
-- "iconName": plasmoid.nativeInterface.resolveIcon(item.IconName, item.IconThemePath),
-+ "iconName": item.IconName,
- "icon": item.Icon
- });
- }
-
---- a/applets/systemtray/package/contents/ui/items/StatusNotifierItem.qml
-+++ b/applets/systemtray/package/contents/ui/items/StatusNotifierItem.qml
-@@ -28,7 +28,7 @@
- text: Title
- mainText: ToolTipTitle != "" ? ToolTipTitle : Title
- subText: ToolTipSubTitle
-- icon: ToolTipIcon != "" ? ToolTipIcon : plasmoid.nativeInterface.resolveIcon(IconName != "" ? IconName : Icon, IconThemePath)
-+ icon: ToolTipIcon != "" ? ToolTipIcon : Icon ? Icon : IconName
- textFormat: Text.AutoText
- category: Category
-
-@@ -48,7 +48,7 @@
-
- PlasmaCore.IconItem {
- id: iconItem
-- source: plasmoid.nativeInterface.resolveIcon(IconName != "" ? IconName : Icon, IconThemePath)
-+ source: Icon ? Icon : IconName
- width: Math.min(parent.width, parent.height)
- height: width
- active: taskIcon.containsMouse
-
---- a/applets/systemtray/systemtray.cpp
-+++ b/applets/systemtray/systemtray.cpp
-@@ -37,36 +37,10 @@
- #include <Plasma/PluginLoader>
- #include <Plasma/ServiceJob>
-
--#include <KIconLoader>
--#include <KIconEngine>
- #include <KActionCollection>
- #include <KLocalizedString>
-
- #include <plasma_version.h>
--
--/*
-- * An app may also load icons from their own directories, so we need a new iconloader that takes this into account
-- * This is wrapped into a subclass of iconengine so the iconloader lifespan matches the icon object
-- */
--class AppIconEngine : public KIconEngine
--{
--public:
-- AppIconEngine(const QString &variant, const QString &path, const QString &appName);
-- ~AppIconEngine();
--private:
-- KIconLoader* m_loader;
--};
--
--AppIconEngine::AppIconEngine(const QString &variant, const QString &path, const QString &appName) :
-- KIconEngine(variant, m_loader = new KIconLoader(appName, QStringList()))
--{
-- m_loader->addAppDir(appName, path);
--}
--
--AppIconEngine::~AppIconEngine()
--{
-- delete m_loader;
--}
-
- class PlasmoidModel: public QStandardItemModel
- {
-@@ -167,32 +141,6 @@
- emit appletDeleted(applet);
- }
- }
--}
--
--QVariant SystemTray::resolveIcon(const QVariant &variant, const QString &iconThemePath)
--{
-- if (variant.canConvert<QString>()) {
-- if (!iconThemePath.isEmpty()) {
-- const QString path = iconThemePath;
-- if (!path.isEmpty()) {
-- // FIXME: If last part of path is not "icons", this won't work!
-- auto tokens = path.splitRef('/', QString::SkipEmptyParts);
-- if (tokens.length() >= 3 && tokens.takeLast() == QLatin1String("icons")) {
-- const QString appName = tokens.takeLast().toString();
--
-- return QVariant(QIcon(new AppIconEngine(variant.toString(), path, appName)));
-- } else {
-- qCWarning(SYSTEM_TRAY) << "Wrong IconThemePath" << path << ": too short or does not end with 'icons'";
-- }
-- }
--
-- //return just the string hoping that IconItem will know how to interpret it anyways as either a normal icon or a SVG from the theme
-- return variant;
-- }
-- }
--
-- // Most importantly QIcons. Nothing to do for those.
-- return variant;
- }
-
- void SystemTray::showPlasmoidMenu(QQuickItem *appletInterface, int x, int y)
-
---- a/applets/systemtray/systemtray.h
-+++ b/applets/systemtray/systemtray.h
-@@ -59,12 +59,6 @@
- void cleanupTask(const QString &task);
-
- //Invokable utilities
-- /**
-- * returns either a simple icon name or a custom path if the app is
-- * using a custom theme
-- */
-- Q_INVOKABLE QVariant resolveIcon(const QVariant &variant, const QString &iconThemePath);
--
- /**
- * Given an AppletInterface pointer, shows a proper context menu for it
- */
-
---- a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
-+++ b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
-@@ -240,14 +240,19 @@
- if (!m_customIconLoader) {
- m_customIconLoader = new KIconLoader(QString(), QStringList(), this);
- }
-+ // FIXME: If last part of path is not "icons", this won't work!
-+ QString appName;
-+ auto tokens = path.splitRef('/', QString::SkipEmptyParts);
-+ if (tokens.length() >= 3 && tokens.takeLast() == QLatin1String("icons"))
-+ appName = tokens.takeLast().toString();
-
- //icons may be either in the root directory of the passed path or in a appdir format
- //i.e hicolor/32x32/iconname.png
-
-- m_customIconLoader->reconfigure(QString(), QStringList(path));
-+ m_customIconLoader->reconfigure(appName, QStringList(path));
-
- //add app dir requires an app name, though this is completely unused in this context
-- m_customIconLoader->addAppDir(QStringLiteral("unused"), path);
-+ m_customIconLoader->addAppDir(appName.size() ? appName : QStringLiteral("unused"), path);
- }
- setData(QStringLiteral("IconThemePath"), path);
-
-