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

Docker: Fix indentation

Browse Source 
Change-Id: Ice8634c7de27a10dcb4ad7d25fdc3c5933146815
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-31 11:22:51 +02:00
parent 841b6a84cd
commit 9ba5d9d8a8
1 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/plugins/docker/dockerdevice.cpp
View File

@@ -363,34 +363,34 @@ const DockerDeviceData &DockerDevice::data() const
BaseQtVersion *DockerDevicePrivate::autoDetectQtVersion() const BaseQtVersion *DockerDevicePrivate::autoDetectQtVersion() const
{ {
QString error; QString error;
QString source = "docker:" + m_data.imageId; QString source = "docker:" + m_data.imageId;
const QStringList candidates = {"/usr/local/bin/qmake", "/usr/bin/qmake"}; const QStringList candidates = {"/usr/local/bin/qmake", "/usr/bin/qmake"};
for (const QString &candidate : candidates) { for (const QString &candidate : candidates) {
const FilePath qmake = q->mapToGlobalPath(FilePath::fromString(candidate)); const FilePath qmake = q->mapToGlobalPath(FilePath::fromString(candidate));
if (auto qtVersion = QtVersionFactory::createQtVersionFromQMakePath(qmake, false, source, &error)) { if (auto qtVersion = QtVersionFactory::createQtVersionFromQMakePath(qmake, false, source, &error)) {
QtVersionManager::addVersion(qtVersion); QtVersionManager::addVersion(qtVersion);
return qtVersion; return qtVersion;
} }
} }
return nullptr; return nullptr;
} }
QList<ToolChain *> DockerDevicePrivate::autoDetectToolChains() QList<ToolChain *> DockerDevicePrivate::autoDetectToolChains()
{ {
const QList<ToolChainFactory *> factories = ToolChainFactory::allToolChainFactories(); const QList<ToolChainFactory *> factories = ToolChainFactory::allToolChainFactories();
QList<ToolChain *> toolChains; QList<ToolChain *> toolChains;
for (ToolChainFactory *factory : factories) { for (ToolChainFactory *factory : factories) {
const QList<ToolChain *> newToolChains = factory->autoDetect(toolChains, q->sharedFromThis()); const QList<ToolChain *> newToolChains = factory->autoDetect(toolChains, q->sharedFromThis());
for (ToolChain *toolChain : newToolChains) { for (ToolChain *toolChain : newToolChains) {
LOG("Found ToolChain: " << toolChain->compilerCommand().toUserOutput()); LOG("Found ToolChain: " << toolChain->compilerCommand().toUserOutput());
ToolChainManager::registerToolChain(toolChain); ToolChainManager::registerToolChain(toolChain);
toolChains.append(toolChain); toolChains.append(toolChain);
} }
} }
return toolChains; return toolChains;
} }
void DockerDevicePrivate::autoDetectCMake() void DockerDevicePrivate::autoDetectCMake()
@@ -399,19 +399,19 @@ void DockerDevicePrivate::autoDetectCMake()
if (!cmakeManager) if (!cmakeManager)
return; return;
QString error; QString error;
QString source = "docker:" + m_data.imageId; QString source = "docker:" + m_data.imageId;
const QStringList candidates = {"/usr/local/bin/cmake", "/usr/bin/cmake"}; const QStringList candidates = {"/usr/local/bin/cmake", "/usr/bin/cmake"};
for (const QString &candidate : candidates) { for (const QString &candidate : candidates) {
const FilePath cmake = q->mapToGlobalPath(FilePath::fromString(candidate)); const FilePath cmake = q->mapToGlobalPath(FilePath::fromString(candidate));
QTC_CHECK(q->hasLocalFileAccess()); QTC_CHECK(q->hasLocalFileAccess());
if (cmake.isExecutableFile()) { if (cmake.isExecutableFile()) {
const bool res = QMetaObject::invokeMethod(cmakeManager, const bool res = QMetaObject::invokeMethod(cmakeManager,
"registerCMakeByPath", "registerCMakeByPath",
Q_ARG(Utils::FilePath, cmake)); Q_ARG(Utils::FilePath, cmake));
QTC_CHECK(res); QTC_CHECK(res);
} }
} }
} }
void DockerDevicePrivate::setupKit() void DockerDevicePrivate::setupKit()
@@ -465,12 +465,12 @@ void DockerDevicePrivate::tryCreateLocalFileAccess()
m_shell = new QtcProcess; m_shell = new QtcProcess;
// FIXME: Make mounts flexible // FIXME: Make mounts flexible
m_shell->setCommand({"docker", {"run", "-i", "--cidfile=" + tempFileName, m_shell->setCommand({"docker", {"run", "-i", "--cidfile=" + tempFileName,
"-v", "/opt:/opt", "-v", "/opt:/opt",
"-v", "/data:/data", "-v", "/data:/data",
"-e", "DISPLAY=:0", "-e", "DISPLAY=:0",
"-e", "XAUTHORITY=/.Xauthority", "-e", "XAUTHORITY=/.Xauthority",
"--net", "host", "--net", "host",
m_data.imageId, "/bin/sh"}}); m_data.imageId, "/bin/sh"}});
LOG("RUNNING: " << m_shell->commandLine().toUserOutput()); LOG("RUNNING: " << m_shell->commandLine().toUserOutput());
m_shell->start(); m_shell->start();
m_shell->waitForStarted(); m_shell->waitForStarted();
@@ -515,7 +515,7 @@ FilePath DockerDevice::mapToLocalAccess(const FilePath &filePath) const
QString path = filePath.path(); QString path = filePath.path();
if (path.startsWith('/')) if (path.startsWith('/'))
return FilePath::fromString(d->m_mergedDir + path); return FilePath::fromString(d->m_mergedDir + path);
return FilePath::fromString(d->m_mergedDir + '/' + path); return FilePath::fromString(d->m_mergedDir + '/' + path);
} }
FilePath DockerDevice::mapFromLocalAccess(const FilePath &filePath) const FilePath DockerDevice::mapFromLocalAccess(const FilePath &filePath) const