forked from qt-creator/qt-creator
Docker: use docker device os type for file access
Change-Id: I3e3e91491c77d0146f2d52777ba1d05d2f45a9d3 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -124,6 +124,7 @@ public:
|
|||||||
RunResult runInShell(const CommandLine &cmdLine,
|
RunResult runInShell(const CommandLine &cmdLine,
|
||||||
const QByteArray &stdInData) const override;
|
const QByteArray &stdInData) const override;
|
||||||
QString mapToDevicePath(const FilePath &filePath) const override;
|
QString mapToDevicePath(const FilePath &filePath) const override;
|
||||||
|
OsType osType(const FilePath &filePath) const override;
|
||||||
|
|
||||||
DockerDevicePrivate *m_dev = nullptr;
|
DockerDevicePrivate *m_dev = nullptr;
|
||||||
};
|
};
|
||||||
@@ -367,6 +368,12 @@ QString DockerDeviceFileAccess::mapToDevicePath(const FilePath &filePath) const
|
|||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OsType DockerDeviceFileAccess::osType(const FilePath &filePath) const
|
||||||
|
{
|
||||||
|
QTC_ASSERT(m_dev, return UnixDeviceFileAccess::osType(filePath));
|
||||||
|
return m_dev->q->osType();
|
||||||
|
}
|
||||||
|
|
||||||
DockerDevice::DockerDevice(DockerSettings *settings, const DockerDeviceData &data)
|
DockerDevice::DockerDevice(DockerSettings *settings, const DockerDeviceData &data)
|
||||||
: d(new DockerDevicePrivate(this, settings, data))
|
: d(new DockerDevicePrivate(this, settings, data))
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user