27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
Index: kdeui/actions/kstandardaction.cpp
|
|
===================================================================
|
|
--- kdeui/actions/kstandardaction.cpp (revision 1013099)
|
|
+++ kdeui/actions/kstandardaction.cpp (revision 1013100)
|
|
@@ -198,12 +198,15 @@
|
|
}
|
|
|
|
if (recvr && slot) {
|
|
- if (id != OpenRecent)
|
|
- QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
|
|
- else
|
|
- // FIXME KAction port: probably a good idea to find a cleaner way to do this
|
|
- // Open Recent is a special case - provide the selected URL
|
|
- QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
|
|
+ if (id == OpenRecent) {
|
|
+ // FIXME KAction port: probably a good idea to find a cleaner way to do this
|
|
+ // Open Recent is a special case - provide the selected URL
|
|
+ QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
|
|
+ } else if (id == ConfigureToolbars) { // #200815
|
|
+ QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot, Qt::QueuedConnection);
|
|
+ } else {
|
|
+ QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
|
|
+ }
|
|
}
|
|
|
|
KActionCollection *collection = qobject_cast<KActionCollection *>(parent);
|