Commit 6080a94f authored by Dawit Alemayehu's avatar Dawit Alemayehu
Browse files

Handle top level directories with a ':' in their names, e.g. /F:, correctly on

non-Windows platforms.

BUG: 194746
FIXED-IN: 4.7.0
REVIEW: 101906

(cherry picked from commit b66e59e1)
parent 86c29048
......@@ -888,6 +888,12 @@ QString KUrl::toLocalFile( AdjustPathOption trailing ) const
urlWithoutHost.setHost(QString());
return trailingSlash(trailing, urlWithoutHost.toLocalFile());
}
#warning FIXME: Remove #ifdef below once upstream bug, QTBUG-20322, is fixed. Also see BR# 194746.
#ifndef Q_WS_WIN
if (isLocalFile()) {
return trailingSlash(trailing, QUrl::path());
}
#endif
return trailingSlash(trailing, QUrl::toLocalFile());
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment