[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs/KDE/4=2E7=5D_kdecore/io=3A_Handle_top_level?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-07-12 15:32:56
Message-ID: 20110712153256.E636DA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit b66e59e16c5bd94772911f01b9517abb8f13658f by Dawit Alemayehu.
Committed on 10/07/2011 at 08:36.
Pushed by adawit into branch 'KDE/4.7'.

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

M  +6    -0    kdecore/io/kurl.cpp     

http://commits.kde.org/kdelibs/b66e59e16c5bd94772911f01b9517abb8f13658f

diff --git a/kdecore/io/kurl.cpp b/kdecore/io/kurl.cpp
index 90ececf..adf11e4 100644
--- a/kdecore/io/kurl.cpp
+++ b/kdecore/io/kurl.cpp
@@ -872,6 +872,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());
 }
 

[prev in list] [next in list] [prev in thread] [next in thread]