[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 582802b7ffe0c453507320edf9ceaa41bd0f148e
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 10:16:19 2010 +0000

    Unreviewed buildfix after r55823. (To fix Qt --minimal build.)
    I have déjà vu, I'm sure that I did it before. (r55598)
    
    * bindings/js/JSDOMWindowCustom.cpp: Missing #if ENABLE(DATABASE) guard added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55838 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index facfda9..b822639 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-03-11  Csaba Osztrogonác  <ossy at webkit.org>
 
+        Unreviewed buildfix after r55823. (To fix Qt --minimal build.)
+        I have déjà vu, I'm sure that I did it before. (r55598)
+
+        * bindings/js/JSDOMWindowCustom.cpp: Missing #if ENABLE(DATABASE) guard added. 
+
+2010-03-11  Csaba Osztrogonác  <ossy at webkit.org>
+
         [Qt] Unreviewed buildfix after r55833.
 
         Rename all instances of data() to characters()
diff --git a/WebCore/bindings/js/JSDOMWindowCustom.cpp b/WebCore/bindings/js/JSDOMWindowCustom.cpp
index b49c5db..e8c2781 100644
--- a/WebCore/bindings/js/JSDOMWindowCustom.cpp
+++ b/WebCore/bindings/js/JSDOMWindowCustom.cpp
@@ -968,6 +968,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))
@@ -985,6 +986,7 @@ JSValue JSDOMWindow::openDatabase(ExecState* exec, const ArgList& args)
     setDOMException(exec, ec);
     return result;
 }
+#endif
 
 DOMWindow* toDOMWindow(JSValue value)
 {

-- 
WebKit Debian packaging