From 7d311bc5511f908fa82d9bb74c34e3d9c4df8d55 Mon Sep 17 00:00:00 2001 From: Ashish Kulkarni Date: Mon, 5 May 2014 18:09:18 +0530 Subject: fix QWebSettings::setUserStyleSheetUrl() not working with windows paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QWebSettings::setUserStyleSheetUrl() does not work with windows paths that contain drive letters. KURL::path() alone does not handle removing the leading slash from a windows file path. Using QUrl::toLocalFile() will turn ​file:///C:/path into C:/path appropriately This fixes https://bugs.webkit.org/show_bug.cgi?id=34884. Change-Id: I37a1482b67447be6ea6a10966cf59c9159db83cd Reviewed-by: Simon Hausmann Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty/webkit/Source/WebCore/platform/qt/KURLQt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/Source/WebCore/platform/qt/KURLQt.cpp b/src/3rdparty/webkit/Source/WebCore/platform/qt/KURLQt.cpp index f6d2a86..49df59a 100644 --- a/src/3rdparty/webkit/Source/WebCore/platform/qt/KURLQt.cpp +++ b/src/3rdparty/webkit/Source/WebCore/platform/qt/KURLQt.cpp @@ -46,7 +46,7 @@ String KURL::fileSystemPath() const if (!isValid() || !protocolIs("file")) return String(); - return String(path()); + return static_cast(*this).toLocalFile(); } } -- cgit v0.12