forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/master' into work
Change-Id: I2235a55a599aaeca5d2b5377300a044b66c17da9
This commit is contained in:
@@ -14,11 +14,14 @@
|
||||
#include <coreplugin/icore.h>
|
||||
#include <coreplugin/messagemanager.h>
|
||||
|
||||
#include <projectexplorer/buildconfiguration.h>
|
||||
#include <projectexplorer/devicesupport/devicemanager.h>
|
||||
#include <projectexplorer/devicesupport/idevicewidget.h>
|
||||
#include <projectexplorer/kitinformation.h>
|
||||
#include <projectexplorer/kitmanager.h>
|
||||
#include <projectexplorer/project.h>
|
||||
#include <projectexplorer/runcontrol.h>
|
||||
#include <projectexplorer/target.h>
|
||||
#include <projectexplorer/toolchain.h>
|
||||
#include <projectexplorer/toolchainmanager.h>
|
||||
|
||||
@@ -145,6 +148,8 @@ public:
|
||||
|
||||
CommandLine withDockerExecCmd(const CommandLine &cmd, bool interactive = false);
|
||||
|
||||
bool prepareForBuild(const Target *target);
|
||||
|
||||
private:
|
||||
bool createContainer();
|
||||
void startContainer();
|
||||
@@ -445,6 +450,14 @@ static QString getLocalIPv4Address()
|
||||
return QString();
|
||||
}
|
||||
|
||||
bool DockerDevicePrivate::prepareForBuild(const Target *target)
|
||||
{
|
||||
QTC_ASSERT(QThread::currentThread() == thread(), return false);
|
||||
|
||||
return ensureReachable(target->project()->projectDirectory())
|
||||
&& ensureReachable(target->activeBuildConfiguration()->buildDirectory());
|
||||
}
|
||||
|
||||
bool DockerDevicePrivate::createContainer()
|
||||
{
|
||||
if (!m_settings)
|
||||
@@ -1357,4 +1370,9 @@ void DockerDevicePrivate::setData(const DockerDeviceData &data)
|
||||
}
|
||||
}
|
||||
|
||||
bool DockerDevice::prepareForBuild(const Target *target)
|
||||
{
|
||||
return d->prepareForBuild(target);
|
||||
}
|
||||
|
||||
} // namespace Docker::Internal
|
||||
|
||||
Reference in New Issue
Block a user