summaryrefslogtreecommitdiffstats
path: root/WebKit/qt/Api/qwebdatabase.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-05-13 17:58:43 +0100
committerBen Murdoch <benm@google.com>2009-05-15 11:38:01 +0100
commit8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d (patch)
treead83ccc3e517a60955ebedbfc855a4a97558f508 /WebKit/qt/Api/qwebdatabase.cpp
parent8fe05189c51b0ae29ba6f8c9d4c86fa288110707 (diff)
downloadexternal_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.zip
external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.tar.gz
external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.tar.bz2
Apply fixes for webkit bugs 24776 and 25616 to add ENABLE(DATABASE) guards. This makes the macro work, so ENABLE_DATABASE can be toggled in config.h and the JavaScriptCore.derived.mk or V8Bindings.derived.mk.
Diffstat (limited to 'WebKit/qt/Api/qwebdatabase.cpp')
-rw-r--r--WebKit/qt/Api/qwebdatabase.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebKit/qt/Api/qwebdatabase.cpp b/WebKit/qt/Api/qwebdatabase.cpp
index 489ab17..0203d72 100644
--- a/WebKit/qt/Api/qwebdatabase.cpp
+++ b/WebKit/qt/Api/qwebdatabase.cpp
@@ -19,6 +19,9 @@
#include "config.h"
#include "qwebdatabase.h"
+
+#if ENABLE(DATABASE)
+
#include "qwebdatabase_p.h"
#include "qwebsecurityorigin.h"
#include "qwebsecurityorigin_p.h"
@@ -146,3 +149,5 @@ void QWebDatabase::removeDatabase(const QWebDatabase &db)
QWebDatabase::~QWebDatabase()
{
}
+
+#endif