From 1b914638db989aaa98631a1c1e02c7b2d44805d8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 11 May 2012 09:43:24 +0200 Subject: Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736) New snapshot to include QDeclarative* -> QQml* build fixes --- Source/WebKit/qt/Api/qwebsettings.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp') diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index ca264c8af..4e01836f7 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -1174,7 +1174,11 @@ void QWebSettings::enablePersistentStorage(const QString& path) #if ENABLE(NETSCAPE_PLUGIN_METADATA_CACHE) // All applications can share the common QtWebkit cache file(s). // Path is not configurable and uses QDesktopServices::CacheLocation by default. +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + QString cachePath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); +#else QString cachePath = QDesktopServices::storageLocation(QDesktopServices::CacheLocation); +#endif WebCore::makeAllDirectories(cachePath); QFileInfo info(cachePath); -- cgit v1.2.1