Qt build fix II.
authorbarraclough@apple.com <barraclough@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Aug 2010 22:02:26 +0000 (22:02 +0000)
committerbarraclough@apple.com <barraclough@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Aug 2010 22:02:26 +0000 (22:02 +0000)
* WebCore.xcodeproj/project.pbxproj:
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::convertValueToQVariant):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@65189 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/bridge/qt/qt_class.cpp

index 677ee0c..7254803 100644 (file)
@@ -1,5 +1,13 @@
 2010-08-11  Gavin Barraclough  <barraclough@apple.com>
 
+        Qt build fix II.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::convertValueToQVariant):
+
+2010-08-11  Gavin Barraclough  <barraclough@apple.com>
+
         Qt build fix.
 
         * WebCore.xcodeproj/project.pbxproj:
index d809c81..4c29c69 100644 (file)
@@ -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