yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.12' into Plasma/5.17

Browse source
This commit is contained in:
David Edmundson 2019-10-15 12:40:42 +01:00
commit 82f4e03d7a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tabbox/tabbox.cpp
View file

@ -532,7 +532,7 @@ void TabBox::key(const char *actionName, Slot slot, const QKeySequence &shortcut
a->setProperty("componentName", QStringLiteral(KWIN_NAME)); a->setProperty("componentName", QStringLiteral(KWIN_NAME));
a->setObjectName(QString::fromUtf8(actionName)); a->setObjectName(QString::fromUtf8(actionName));
a->setText(i18n(actionName)); a->setText(i18n(actionName));
KGlobalAccel::self()->setShortcut(a, QList<QKeySequence>() << shortcut); KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << shortcut);
input()->registerShortcut(shortcut, a, TabBox::self(), slot); input()->registerShortcut(shortcut, a, TabBox::self(), slot);
auto cuts = KGlobalAccel::self()->shortcut(a); auto cuts = KGlobalAccel::self()->shortcut(a);
globalShortcutChanged(a, cuts.isEmpty() ? QKeySequence() : cuts.first()); globalShortcutChanged(a, cuts.isEmpty() ? QKeySequence() : cuts.first());