summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
diff options
context:
space:
mode:
authorBenjamin Zeller <benjamin.zeller@canonical.com>2015-03-04 13:32:31 +0100
committerBenjamin Zeller <benjamin.zeller@canonical.com>2015-03-09 16:15:28 +0000
commitbebcf69ce92442652bfa270de20ecef321ec0613 (patch)
treeed0dcb049e7b040298f094d3f12bfc918dfc769f /src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
parent3cd0463f3235406262d1e220c239f6e3b70bf65b (diff)
downloadqt-creator-bebcf69ce92442652bfa270de20ecef321ec0613.tar.gz
CMakeProjectManager: Provide way for plugins to autodetect cmake tools
This patch adds support for plugins to register a callback/lambda to autodetect CMakeTools that would not be found by the default auto- detection function. Without this feature the CMakeToolManager would drop autodetected CMakeTools otherwise on every start. Change-Id: I23b146e5b9acc60018ac87ea4b6cc7573fa0dd30 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
index 57f3a77380..9aca653fc6 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
@@ -73,7 +73,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
addAutoReleasedObject(new CMakeLocatorFilter);
new CMakeToolManager(this);
- CMakeToolManager::restoreCMakeTools();
ProjectExplorer::KitManager::registerKitInformation(new CMakeKitInformation);
@@ -82,4 +81,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
void CMakeProjectPlugin::extensionsInitialized()
{
+ //restore the cmake tools before loading the kits
+ CMakeToolManager::restoreCMakeTools();
}