Correct method of making shortcuts work with hidden menu bar, now possible with kdelibs changes.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=693130

src/MainWindow.cpp

@@ -59,6 +59,8 @@ MainWindow::MainWindow()
     // the directory ('konsole') is included in the path here so that the XML
     // file can be found when this code is being used in the Konsole part.
     setXMLFile("konsole/konsoleui.rc");
+
+    actionCollection()->setAssociatedWidget(this);
     setupActions();
 
     // create view manager
@@ -81,13 +83,6 @@ MainWindow::MainWindow()
     // replace standard shortcuts which cannot be used in a terminal
     // (as they are reserved for use by terminal programs)
     correctShortcuts();
-
-    // add all actions to this window, so that the keyboard shortcuts can be
-    // used even when the menu is hidden
-    //
-    // See comments in SessionController constructor about Qt 4 behaviour with
-    // hidden menu bars and shortcuts
-    addActions(actionCollection()->actions());
 }
 
 void MainWindow::correctShortcuts()