Git commit a9a58b1ed50769532e163013923ad70710f77fdd by Vlad Zahorodnii, on behalf of Ismael Asensio. Committed on 05/05/2023 at 09:22. Pushed by iasensio into branch 'master'.
Port usage of kcmshell5 to kcmshell6 Just two instances: - in useractions for the menu action "Configure Window Manager" - in the docbook about the key shortcuts M +1 -1 doc/windowspecific/index.docbook M +2 -2 src/useractions.cpp https://invent.kde.org/plasma/kwin/commit/a9a58b1ed50769532e163013923ad70710f77fdd diff --git a/doc/windowspecific/index.docbook b/doc/windowspecific/index.docbook index b662744e2b7..a977d28d6ec 100644 --- a/doc/windowspecific/index.docbook +++ b/doc/windowspecific/index.docbook @@ -471,7 +471,7 @@ and <guibutton>Move Down</guibutton> buttons effects on how they are applied.</p </varlistentry> <varlistentry><term><emphasis role="bold">Ignore global shortcuts</emphasis></term> <listitem> - <para>Toggle whether to ignore global shortcuts (as defined by <menuchoice><guimenu>System Settings</guimenu><guisubmenu>Shortcuts and Gestures</guisubmenu><guimenuitem>Global Shortcuts</guimenuitem></menuchoice> or by running <varname>kcmshell5 keys</varname> in <guilabel>konsole</guilabel>) while the window is active.</para> + <para>Toggle whether to ignore global shortcuts (as defined by <menuchoice><guimenu>System Settings</guimenu><guisubmenu>Shortcuts and Gestures</guisubmenu><guimenuitem>Global Shortcuts</guimenuitem></menuchoice> or by running <varname>kcmshell6 keys</varname> in <guilabel>konsole</guilabel>) while the window is active.</para> </listitem> </varlistentry> <varlistentry><term><emphasis role="bold">Closeable</emphasis></term> diff --git a/src/useractions.cpp b/src/useractions.cpp index 698d544947e..11ac4005eea 100644 --- a/src/useractions.cpp +++ b/src/useractions.cpp @@ -304,11 +304,11 @@ void UserActionsMenu::init() QProcess *p = new QProcess(this); p->setArguments(args); p->setProcessEnvironment(kwinApp()->processStartupEnvironment()); - p->setProgram(QStringLiteral("kcmshell5")); + p->setProgram(QStringLiteral("kcmshell6")); connect(p, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), p, &QProcess::deleteLater); connect(p, &QProcess::errorOccurred, this, [](QProcess::ProcessError e) { if (e == QProcess::FailedToStart) { - qCDebug(KWIN_CORE) << "Failed to start kcmshell5"; + qCDebug(KWIN_CORE) << "Failed to start kcmshell6"; } }); p->start();
