Merge remote-tracking branch 'origin/9.0'

Change-Id: Id7665d5a269ef58cbbb2dbfc1e5b0d1820c4e13e
This commit is contained in:
Eike Ziller
2022-11-17 16:11:52 +01:00
40 changed files with 91 additions and 67 deletions

View File

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