diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-10-06 09:48:24 (GMT) |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-10-06 09:48:24 (GMT) |
| commit | f532679ca11914b453e22342f2ae5e9f790ce47a (patch) | |
| tree | adac34f748aefdd1c88a71ce790b7ad62710de61 /src/3rdparty | |
| parent | 651135cf53aacc4f580cc382b8192bd313366ed8 (diff) | |
| download | Qt-f532679ca11914b453e22342f2ae5e9f790ce47a.zip Qt-f532679ca11914b453e22342f2ae5e9f790ce47a.tar.gz Qt-f532679ca11914b453e22342f2ae5e9f790ce47a.tar.bz2 | |
Fixes assert in QDeclarativeWebView
If QDeclarativeWebView was instantiated twice
an assert was triggered by QWebSettings::enablePersistentStorage();
This patch is crtical for tooling (Bauhaus)
Task-number: QTBUG-14278
Reviewed-by: Aaron Kennedy
Diffstat (limited to 'src/3rdparty')
| -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); |