summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Pol <[email protected]>2017-01-09 16:15:49 +0100
committerAleix Pol <[email protected]>2017-01-09 18:55:23 +0100
commitd579beb13486453d3c3d5dd314987eda63605a95 (patch)
tree522473a6b5653103bfe65a8ce153ed3fbe68545d
parent9a59efb41c20447c64070ec92831c89385511389 (diff)
Make sure we use kpackagetool5 instead of plasmapkg2
Summary: It's been deprecated since longtime Reviewers: #plasma, davidedmundson, mart Reviewed By: #plasma, davidedmundson, mart Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D4045
-rw-r--r--design/plasmoids2
-rw-r--r--kcms/desktoptheme/kcm.cpp5
-rw-r--r--kcms/desktoptheme/plasma-themes.knsrc4
3 files changed, 5 insertions, 6 deletions
diff --git a/design/plasmoids b/design/plasmoids
index 7018573..63f05d6 100644
--- a/design/plasmoids
+++ b/design/plasmoids
@@ -78,5 +78,5 @@ Useful optional fields include:
Installing and Replacing
========================
-Plasmoid packages can be installed and removed from the Add Widgets interfaces of various Plasma applications, such as plasma desktop, or directly using the plasmapkg binary. See the output of `plasmapkg --help` for more information on using that utility.
+Plasmoid packages can be installed and removed from the Add Widgets interfaces of various Plasma applications, such as plasma desktop, or directly using the kpackagetool5 binary. See the output of `kpackagetool5 --help` for more information on using that utility.
diff --git a/kcms/desktoptheme/kcm.cpp b/kcms/desktoptheme/kcm.cpp
index 478ee0e..94c9fd0 100644
--- a/kcms/desktoptheme/kcm.cpp
+++ b/kcms/desktoptheme/kcm.cpp
@@ -107,9 +107,8 @@ void KCMDesktopTheme::installThemeFromFile(const QUrl &file)
{
qCDebug(KCM_DESKTOP_THEME) << "Installing ... " << file;
- QString program = QStringLiteral("plasmapkg2");
- QStringList arguments;
- arguments << QStringLiteral("-t") << QStringLiteral("theme") << QStringLiteral("-i") << file.toLocalFile();
+ const QString program = QStringLiteral("kpackagetool5");
+ const QStringList arguments = { QStringLiteral("--type"), QStringLiteral("Plasma/Theme"), QStringLiteral("--install"), file.toLocalFile()};
qCDebug(KCM_DESKTOP_THEME) << program << arguments.join(QStringLiteral(" "));
QProcess *myProcess = new QProcess(this);
diff --git a/kcms/desktoptheme/plasma-themes.knsrc b/kcms/desktoptheme/plasma-themes.knsrc
index d2a83b1..34f8a6c 100644
--- a/kcms/desktoptheme/plasma-themes.knsrc
+++ b/kcms/desktoptheme/plasma-themes.knsrc
@@ -22,5 +22,5 @@ Name[zh_CN]=Plasma 主题
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Plasma Theme
StandardResource=tmp
-InstallationCommand=plasmapkg2 -t theme -i %f
-UninstallCommand=plasmapkg2 -t theme -r %f
+InstallationCommand=kpackagetool5 -t Plasma/Theme -i %f
+UninstallCommand=kpackagetool5 -t Plasma/Theme -r %f