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

ProjectExplorer: add async toolchain autodetection

Browse Source 
Change-Id: I82c6d0b22a9d36674c58561ef654d7ffde8574da
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2024-01-02 09:05:37 +01:00
parent 00ba645fe1
commit 9e73dc1f09
3 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -9,6 +9,7 @@
#include "toolchainmanager.h"
#include "task.h"
#include <utils/async.h>
#include <utils/qtcassert.h>
#include <QUuid>
@@ -656,6 +657,12 @@ Id ToolchainFactory::supportedToolchainType() const
return m_supportedToolchainType;
}
std::optional<AsyncToolchainDetector> ToolchainFactory::asyncAutoDetector(
const ToolchainDetector &) const
{
return {};
}
void ToolchainFactory::setSupportedToolchainType(const Id &supportedToolchainType)
{
m_supportedToolchainType = supportedToolchainType;
@@ -752,4 +759,35 @@ BadToolchains BadToolchains::fromVariant(const QVariant &v)
[](const QVariant &e) { return BadToolchain::fromMap(storeFromVariant(e)); });
}
AsyncToolchainDetector::AsyncToolchainDetector(
const ToolchainDetector &detector,
const std::function<Toolchains(const ToolchainDetector &)> &func,
const std::function<bool(const Toolchain *, const Toolchains &)> &alreadyRegistered)
: m_detector(detector)
, m_func(func)
, m_alreadyRegistered(alreadyRegistered)
{
}
void AsyncToolchainDetector::run()
{
auto watcher = new QFutureWatcher<Toolchains>();
QObject::connect(watcher,
&QFutureWatcher<Toolchains>::finished,
[watcher,
alreadyRegistered = m_alreadyRegistered]() {
Toolchains existingTcs = ToolchainManager::toolchains();
for (Toolchain *tc : watcher->result()) {
if (tc->isValid() && !alreadyRegistered(tc, existingTcs)) {
ToolchainManager::registerToolchain(tc);
existingTcs << tc;
} else {
delete tc;
}
}
watcher->deleteLater();
});
watcher->setFuture(Utils::asyncRun(m_func, m_detector));
}
} // namespace ProjectExplorer