aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
diff options
context:
space:
mode:
authorBenjamin Zeller <benjamin.zeller@canonical.com>2015-02-04 17:54:46 +0100
committerBenjamin Zeller <benjamin.zeller@canonical.com>2015-02-24 09:54:43 +0000
commit99e9643dea3871f26c5a09e4a1715ba84c9103e9 (patch)
treebc9045a5081cb8d6b4886fae2f4fa353a771d8e7 /src/plugins/cmakeprojectmanager/cmakeeditor.cpp
parentf4a3b4ca5fa312df82f0067e9139fc18bc4fd57f (diff)
Make it possible to register multiple cmake instances
This patch add the CMakeToolManager, a central repository for cmake instances. One instance is always the currently used "default". By that its possible to switch between different cmake installations. The next step will be adding it to the Kits. Change-Id: I310fdd805e0ed239077a5632303e891dbd1d9ea1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeeditor.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeeditor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
index 09907fff52..967f23946c 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -264,7 +264,7 @@ QString CMakeDocument::suggestedFileName() const
// CMakeEditorFactory
//
-CMakeEditorFactory::CMakeEditorFactory(CMakeSettingsPage *settingsPage)
+CMakeEditorFactory::CMakeEditorFactory()
{
setId(Constants::CMAKE_EDITOR_ID);
setDisplayName(tr(Constants::CMAKE_EDITOR_DISPLAY_NAME));
@@ -278,7 +278,7 @@ CMakeEditorFactory::CMakeEditorFactory(CMakeSettingsPage *settingsPage)
setCommentStyle(Utils::CommentDefinition::HashStyle);
setCodeFoldingSupported(true);
- setCompletionAssistProvider(new CMakeFileCompletionAssistProvider(settingsPage));
+ setCompletionAssistProvider(new CMakeFileCompletionAssistProvider);
setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection
| TextEditorActionHandler::JumpToFileUnderCursor);