feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Remove cmake autodetectionhelpers

Browse Source 
No user in-tree and the Ubuntu SDK for which this code was added
is no more.

Change-Id: I5b0c5f6faccf1adb451c4043378a204bfc350e50
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-06-27 13:27:01 +02:00
parent b10ada3aff
commit 8128d89a0b
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
View File

@@ -54,7 +54,6 @@ public:
Id m_defaultCMake; Id m_defaultCMake;
QList<CMakeTool *> m_cmakeTools; QList<CMakeTool *> m_cmakeTools;
PersistentSettingsWriter *m_writer = nullptr; PersistentSettingsWriter *m_writer = nullptr;
QList<CMakeToolManager::AutodetectionHelper> m_autoDetectionHelpers;
}; };
static CMakeToolManagerPrivate *d = nullptr; static CMakeToolManagerPrivate *d = nullptr;
@@ -180,10 +179,6 @@ static QList<CMakeTool *> autoDetectCMakeTools()
found.append(item); found.append(item);
} }
//execute custom helpers if available
foreach (CMakeToolManager::AutodetectionHelper source, d->m_autoDetectionHelpers)
found.append(source());
return found; return found;
} }
@@ -375,11 +370,6 @@ void CMakeToolManager::restoreCMakeTools()
emit m_instance->cmakeToolsLoaded(); emit m_instance->cmakeToolsLoaded();
} }
void CMakeToolManager::registerAutodetectionHelper(CMakeToolManager::AutodetectionHelper helper)
{
d->m_autoDetectionHelpers.append(helper);
}
void CMakeToolManager::notifyAboutUpdate(CMakeTool *tool) void CMakeToolManager::notifyAboutUpdate(CMakeTool *tool)
{ {
if (!tool || !d->m_cmakeTools.contains(tool)) if (!tool || !d->m_cmakeTools.contains(tool))

3
src/plugins/cmakeprojectmanager/cmaketoolmanager.h
View File

@@ -40,8 +40,6 @@ class CMAKE_EXPORT CMakeToolManager : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
typedef std::function<QList<CMakeTool *> ()> AutodetectionHelper;
CMakeToolManager(QObject *parent); CMakeToolManager(QObject *parent);
~CMakeToolManager() override; ~CMakeToolManager() override;
@@ -57,7 +55,6 @@ public:
static void setDefaultCMakeTool(const Core::Id &id); static void setDefaultCMakeTool(const Core::Id &id);
static CMakeTool *findByCommand(const Utils::FileName &command); static CMakeTool *findByCommand(const Utils::FileName &command);
static CMakeTool *findById(const Core::Id &id); static CMakeTool *findById(const Core::Id &id);
static void registerAutodetectionHelper(AutodetectionHelper helper);
static void notifyAboutUpdate(CMakeTool *); static void notifyAboutUpdate(CMakeTool *);
static void restoreCMakeTools(); static void restoreCMakeTools();