[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ossy at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d4e3d1de31809145ede770f15ddb8dc8ebe3d3cf
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 5 23:26:41 2010 +0000

    Unreviewed buildfix after r55593. (To fix Qt --minimal build.)
    
    * bindings/js/JSDOMWindowCustom.cpp: Missing #if ENABLE(DATABASE) guard added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55598 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 659389d..1f2d874 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-05  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed buildfix after r55593. (To fix Qt --minimal build.)
+
+        * bindings/js/JSDOMWindowCustom.cpp: Missing #if ENABLE(DATABASE) guard added.
+
 2010-03-05  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/bindings/js/JSDOMWindowCustom.cpp b/WebCore/bindings/js/JSDOMWindowCustom.cpp
index 0af6821..96528ea 100644
--- a/WebCore/bindings/js/JSDOMWindowCustom.cpp
+++ b/WebCore/bindings/js/JSDOMWindowCustom.cpp
@@ -1020,6 +1020,7 @@ JSValue JSDOMWindow::removeEventListener(ExecState* exec, const ArgList& args)
     return jsUndefined();
 }
 
+#if ENABLE(DATABASE)
 JSValue JSDOMWindow::openDatabase(ExecState* exec, const ArgList& args)
 {
     if (!allowsAccessFrom(exec) || (args.size() < 4))
@@ -1037,6 +1038,7 @@ JSValue JSDOMWindow::openDatabase(ExecState* exec, const ArgList& args)
     setDOMException(exec, ec);
     return result;
 }
+#endif
 
 DOMWindow* toDOMWindow(JSValue value)
 {

-- 
WebKit Debian packaging