1 files changed, 11 insertions, 2 deletions
diff --git a/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp b/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp
index f5bc6a8c3..9272dfc98 100644
--- a/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp
+++ b/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.cpp
@@ -35,6 +35,10 @@
 #include "Page.h"
 #include "SecurityOrigin.h"
 
+#if PLATFORM(QT)
+#include "Settings.h"
+#endif
+
 namespace WebCore {
 
 DOMWindowIndexedDatabase::DOMWindowIndexedDatabase(DOMWindow* window)
@@ -93,9 +97,9 @@ void DOMWindowIndexedDatabase::willDetachGlobalObjectFromFrame()
     DOMWindowProperty::willDetachGlobalObjectFromFrame();
 }
 
-IDBFactory* DOMWindowIndexedDatabase::indexedDB(DOMWindow* window)
+IDBFactory* DOMWindowIndexedDatabase::indexedDB(DOMWindow& window)
 {
-    return from(window)->indexedDB();
+    return from(&window)->indexedDB();
 }
 
 IDBFactory* DOMWindowIndexedDatabase::indexedDB()
@@ -108,6 +112,11 @@ IDBFactory* DOMWindowIndexedDatabase::indexedDB()
     if (!page)
         return nullptr;
 
+#if PLATFORM(QT)
+    if (!page->settings().offlineStorageDatabaseEnabled())
+        return nullptr;
+#endif
+
     if (!m_window->isCurrentlyDisplayedInFrame())
         return nullptr;