Merge remote-tracking branch 'origin/3.4'

2015-02-25 10:16:16 +01:00
parent 99e9643dea c6a4c80728
commit 9e9755310b
151 changed files with 2184 additions and 1261 deletions
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -290,9 +290,7 @@ bool NoKitPage::isComplete() const

 void NoKitPage::showOptions()
 {
-    Core::ICore::showOptionsDialog(Core::Id(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY),
-                                   Core::Id(ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID),
-                                   this);
+    Core::ICore::showOptionsDialog(ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID, this);
 }

 InSourceBuildPage::InSourceBuildPage(CMakeOpenProjectWizard *cmakeWizard)