Merge remote-tracking branch 'origin/3.4'

2015-03-19 16:00:28 +01:00
parent 318e1ca422 bc6893773f
commit aee54f9df5
94 changed files with 661 additions and 436 deletions
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -985,7 +985,7 @@ void MainWindow::writeSettings()
    settings->endGroup();

    DocumentManager::saveSettings();
-    ActionManager::saveSettings(settings);
+    ActionManager::saveSettings();
    EditorManagerPrivate::saveSettings();
    m_navigationWidget->saveSettings(settings);
 }