Changeset 78269 in webkit

Timestamp:

Feb 10, 2011 2:17:28 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-10 Ademar de Souza Reis Jr <Ademar Reis>

Reviewed by Andreas Kling.

[Qt] Fix assert in QDeclarativeWebView
​https://bugs.webkit.org/show_bug.cgi?id=54240

As reported in:
​http://bugreports.qt.nokia.com/browse/QTBUG-14278

Instantiating a QDeclarativeWebView twice will trigger an assertion
when in debug mode.

Original patch from Thomas Hartmann <​Thomas.Hartmann@nokia.com>,
reviewed (there) by Aaron Kennedy
f532679ca11914b453e22342f2ae5e9f790ce47a

• declarative/qdeclarativewebview.cpp: (QDeclarativeWebView::init):

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• declarative/qdeclarativewebview.cpp (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-02-10  Ademar de Souza Reis Jr  <ademar.reis@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix assert in QDeclarativeWebView
+        https://bugs.webkit.org/show_bug.cgi?id=54240
+
+        As reported in:
+        http://bugreports.qt.nokia.com/browse/QTBUG-14278
+
+        Instantiating a QDeclarativeWebView twice will trigger an assertion
+        when in debug mode.
+
+        Original patch from Thomas Hartmann <Thomas.Hartmann@nokia.com>,
+        reviewed (there) by Aaron Kennedy
+        f532679ca11914b453e22342f2ae5e9f790ce47a
+
+        * declarative/qdeclarativewebview.cpp:
+        (QDeclarativeWebView::init):
+
 2011-02-10  Ademar de Souza Reis Jr  <ademar.reis@openbossa.org>
 

trunk/Source/WebKit/qt/declarative/qdeclarativewebview.cpp

@@ -250 +250 @@
     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);