don't try to associate with widgets.
it's not needed for global shortcuts, and it wouldn't work that way for local shortcuts anyways. svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=815532
This commit is contained in:
parent
2048a57f54
commit
62a32a22a7
@ -942,11 +942,8 @@ void Applet::setGlobalShortcut(const KShortcut &shortcut)
|
||||
d->activationAction->setObjectName(QString("Activate %1 Widget").arg(name())); // NO I18N
|
||||
connect(d->activationAction, SIGNAL(triggered()), this, SIGNAL(activate()));
|
||||
connect(this, SIGNAL(activate()), this, SLOT(setFocus()));
|
||||
|
||||
QList<QWidget *> widgets = d->actions.associatedWidgets();
|
||||
foreach (QWidget *w, widgets) {
|
||||
w->addAction(d->activationAction);
|
||||
}
|
||||
//TODO: when local shortcuts are possible, we'll need to always be associated with the right
|
||||
//widget
|
||||
}
|
||||
|
||||
d->activationAction->setGlobalShortcut(shortcut);
|
||||
|
Loading…
Reference in New Issue
Block a user