diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit/qt/Api/qwebsettings.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index 588dcf7aa..774da5d31 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -46,11 +46,7 @@ #include "FileSystem.h" #include <QApplication> -#if HAVE(QT5) #include <QStandardPaths> -#else -#include <QDesktopServices> -#endif #include <QDir> #include <QHash> #include <QSharedData> @@ -1145,11 +1141,7 @@ void QWebSettings::enablePersistentStorage(const QString& path) if (path.isEmpty()) { -#if HAVE(QT5) storagePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation); -#else - storagePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation); -#endif if (storagePath.isEmpty()) storagePath = WebCore::pathByAppendingComponent(QDir::homePath(), QCoreApplication::applicationName()); } else @@ -1168,11 +1160,7 @@ 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 HAVE(QT5) QString cachePath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); -#else - QString cachePath = QDesktopServices::storageLocation(QDesktopServices::CacheLocation); -#endif WebCore::makeAllDirectories(cachePath); QFileInfo info(cachePath); |