[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 7f8e0d688ee54c05f44986e28071c68b254a2f6c
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 22:02:26 2010 +0000

    Qt build fix II.
    
    * WebCore.xcodeproj/project.pbxproj:
    * bridge/qt/qt_runtime.cpp:
    (JSC::Bindings::convertValueToQVariant):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65189 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 677ee0c..7254803 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-11  Gavin Barraclough  <barraclough at apple.com>
 
+        Qt build fix II.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::convertValueToQVariant):
+
+2010-08-11  Gavin Barraclough  <barraclough at apple.com>
+
         Qt build fix.
 
         * WebCore.xcodeproj/project.pbxproj:
diff --git a/WebCore/bridge/qt/qt_class.cpp b/WebCore/bridge/qt/qt_class.cpp
index d809c81..4c29c69 100644
--- a/WebCore/bridge/qt/qt_class.cpp
+++ b/WebCore/bridge/qt/qt_class.cpp
@@ -71,8 +71,7 @@ JSValue QtClass::fallbackObject(ExecState* exec, Instance* inst, const Identifie
     QtInstance* qtinst = static_cast<QtInstance*>(inst);
 
     const UString& ustring = identifier.ustring();
-    const QByteArray name = QString(reinterpret_cast<const QChar*>(ustring.data()),
-                                    ustring.size()).toAscii();
+    const QByteArray name = QString(reinterpret_cast<const QChar*>(ustring.characters()), ustring.length()).toAscii();
 
     // First see if we have a cache hit
     JSObject* val = qtinst->m_methods.value(name);
@@ -131,7 +130,7 @@ Field* QtClass::fieldNamed(const Identifier& identifier, Instance* instance) con
 
     QObject* obj = qtinst->getObject();
     const UString& ustring = identifier.ustring();
-    const QString name(reinterpret_cast<const QChar*>(ustring.data()), ustring.size());
+    const QString name(reinterpret_cast<const QChar*>(ustring.characters()), ustring.length());
     const QByteArray ascii = name.toAscii();
 
     // First check for a cached field

-- 
WebKit Debian packaging