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

ProjectExplorer: create a root path without scheme for host device

Browse Source 
Change-Id: I966db6378dca533c73635803fb177d31b2c625ac
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
David Schulz
2022-11-17 10:06:19 +01:00
parent 74d915d6aa
commit 895f88f63a
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/filepath.cpp
View File

@@ -1083,6 +1083,7 @@ QString FilePath::calcRelativePath(const QString &absolutePath, const QString &a
*/ */
FilePath FilePath::onDevice(const FilePath &deviceTemplate) const FilePath FilePath::onDevice(const FilePath &deviceTemplate) const
{ {
isSameDevice(deviceTemplate);
const bool sameDevice = scheme() == deviceTemplate.scheme() && host() == deviceTemplate.host(); const bool sameDevice = scheme() == deviceTemplate.scheme() && host() == deviceTemplate.host();
if (sameDevice) if (sameDevice)
return *this; return *this;

7
src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
View File

@@ -150,4 +150,11 @@ Environment DesktopDevice::systemEnvironment() const
return Environment::systemEnvironment(); return Environment::systemEnvironment();
} }
FilePath DesktopDevice::rootPath() const
{
if (id() == DESKTOP_DEVICE_ID)
return FilePath::fromParts({}, {}, QDir::rootPath());
return IDevice::rootPath();
}
} // namespace ProjectExplorer } // namespace ProjectExplorer

2
src/plugins/projectexplorer/devicesupport/desktopdevice.h
View File

@@ -36,6 +36,8 @@ public:
Utils::Environment systemEnvironment() const override; Utils::Environment systemEnvironment() const override;
Utils::FilePath mapToGlobalPath(const Utils::FilePath &pathOnDevice) const override; Utils::FilePath mapToGlobalPath(const Utils::FilePath &pathOnDevice) const override;
Utils::FilePath rootPath() const override;
protected: protected:
DesktopDevice(); DesktopDevice();