Merge remote-tracking branch 'origin/6.0'

Change-Id: I9d25a7ac39b3619856fc8d8a6be6f91a403b3969
This commit is contained in:
Eike Ziller
2021-09-30 09:03:12 +02:00
77 changed files with 1058 additions and 556 deletions

View File

@@ -473,6 +473,18 @@ IDeviceWidget *DockerDevice::createWidget()
return new DockerDeviceWidget(sharedFromThis());
}
Tasks DockerDevice::validate() const
{
Tasks result;
if (d->m_data.mounts.isEmpty()) {
result << Task(Task::Error,
tr("The Docker device has not set up shared directories."
"This will not work for building."),
{}, -1, {});
}
return result;
}
// DockerDevice