diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-07 10:22:23 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-07 10:22:23 +0200 |
| commit | 2ea7f415dbc26cc505fe04f6f6a6ce7766d19608 (patch) | |
| tree | 7243c1e0f755dea2d1ff17427df8681f55274818 /src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp | |
| parent | 91b2bd620bf10ddd9de65f2c3ac7781e591844d4 (diff) | |
| download | qt4-tools-2ea7f415dbc26cc505fe04f6f6a6ce7766d19608.tar.gz | |
Updated WebKit to 07b60cf799680fcfb7785ee88e14f8030a5dbfa2
Bugzilla fixes integrated in this commit:
|| <https://webkit.org/b/37445> || [Qt] Regression: Google calendar edit event details gets stuck on loading ||
|| <https://webkit.org/b/38439> || [Qt] QT_MOBILE_THEME compile time flag ||
|| <https://webkit.org/b/37803> || Spatial Navigation: adapt the logic of {deep}findFocusableNodeInDirection to do traversal starting from Node* not Document* ||
|| <https://webkit.org/b/36755> || [Qt] REGRESSION: Loading of external CSS and JS files over network fails in some cases ||
|| <https://webkit.org/b/36533> || [Qt] Compilation error on Qt for Embedded Linux built with -qconfig small ||
|| <https://webkit.org/b/38585> || Spatial Navigation: add a layout test which runs with Frame Flattening ON ||
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp index e72af368bf..ae7f6a83a9 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp @@ -1052,8 +1052,9 @@ void QWebSettings::enablePersistentStorage(const QString& path) QString storagePath; if (path.isEmpty()) { +#ifndef QT_NO_DESKTOPSERVICES storagePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation); - +#endif if (storagePath.isEmpty()) storagePath = WebCore::pathByAppendingComponent(QDir::homePath(), QCoreApplication::applicationName()); } else |