summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorAshish Kulkarni <kulkarni.ashish@gmail.com>2014-05-05 12:39:18 (GMT)
committerAshish Kulkarni <kulkarni.ashish@gmail.com>2014-12-13 17:27:17 (GMT)
commit7d311bc5511f908fa82d9bb74c34e3d9c4df8d55 (patch)
tree79bf5d132c36aaab089565c11fc752f610cffce6 /src/3rdparty
parent325b6ef5d68a7066df9fb6cf48474257e3d57ea9 (diff)
downloadQt-7d311bc5511f908fa82d9bb74c34e3d9c4df8d55.zip
Qt-7d311bc5511f908fa82d9bb74c34e3d9c4df8d55.tar.gz
Qt-7d311bc5511f908fa82d9bb74c34e3d9c4df8d55.tar.bz2
fix QWebSettings::setUserStyleSheetUrl() not working with windows paths
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 <simon.hausmann@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/webkit/Source/WebCore/platform/qt/KURLQt.cpp2
1 files changed, 1 insertions, 1 deletions
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<QUrl>(*this).toLocalFile();
}
}