summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
diff options
context:
space:
mode:
authorBenjamin Zeller <benjamin.zeller@canonical.com>2015-02-24 21:57:00 +0100
committerBenjamin Zeller <benjamin.zeller@canonical.com>2015-03-03 12:47:36 +0000
commit1e2d2665414d7e62bd816e542fd3ea0b568c0b69 (patch)
treecc4a7d471a0cb5f66b95021156667eff50b873cd /src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
parent20a05c986c09f03a8c023d0189e2f61c49331193 (diff)
downloadqt-creator-1e2d2665414d7e62bd816e542fd3ea0b568c0b69.tar.gz
Make CMakeTool known to the Kits
This patch adds support for binding a specific CMakeTool to a Kit. When creating a new Kit or loading a existing one without a valid CMakeTool, the default CMakeTool will be set. Change-Id: I28d0843a01c583c4b31fc680a0ec556b40cd9c0d Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
index 4930127759..57f3a77380 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
@@ -37,12 +37,13 @@
#include "makestep.h"
#include "cmakeprojectconstants.h"
#include "cmakelocatorfilter.h"
-#include "cmakefilecompletionassist.h"
#include "cmakesettingspage.h"
#include "cmaketoolmanager.h"
+#include "cmakekitinformation.h"
#include <coreplugin/featureprovider.h>
#include <utils/mimetypes/mimedatabase.h>
+#include <projectexplorer/kitmanager.h>
#include <QtPlugin>
#include <QDebug>
@@ -70,11 +71,12 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
addAutoReleasedObject(new CMakeBuildConfigurationFactory);
addAutoReleasedObject(new CMakeEditorFactory);
addAutoReleasedObject(new CMakeLocatorFilter);
- addAutoReleasedObject(new CMakeFileCompletionAssistProvider);
new CMakeToolManager(this);
CMakeToolManager::restoreCMakeTools();
+ ProjectExplorer::KitManager::registerKitInformation(new CMakeKitInformation);
+
return true;
}