diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 18:02:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 18:02:58 (GMT) |
| commit | f2a96da63ce8b351232ee6891fc0f664f563a8ba (patch) | |
| tree | 02ff53642dcda4610d69d4d7a227f19131042817 /src/3rdparty/webkit | |
| parent | ffc4b43af90e5a4cb73ac2003a06f78c1d70d435 (diff) | |
| parent | ea6ce3eb29ce41e017d71699b08d10c3eca76b52 (diff) | |
| download | Qt-f2a96da63ce8b351232ee6891fc0f664f563a8ba.zip Qt-f2a96da63ce8b351232ee6891fc0f664f563a8ba.tar.gz Qt-f2a96da63ce8b351232ee6891fc0f664f563a8ba.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp index 94f08bd..e4f70de 100644 --- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp @@ -249,7 +249,11 @@ void QDeclarativeWebView::init() { d = new QDeclarativeWebViewPrivate(this); - QWebSettings::enablePersistentStorage(); + if (QWebSettings::iconDatabasePath().isNull() && + QWebSettings::globalSettings()->localStoragePath().isNull() && + QWebSettings::offlineStoragePath().isNull() && + QWebSettings::offlineWebApplicationCachePath().isNull()) + QWebSettings::enablePersistentStorage(); setAcceptedMouseButtons(Qt::LeftButton); setFlag(QGraphicsItem::ItemHasNoContents, true); |