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

ggaren at apple.com ggaren at apple.com
Wed Apr 7 23:11:02 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit f1c0278e00f06041a64982e3d8ade6f86cf0a790
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 28 02:20:27 2009 +0000

    Qt build fix: migrated away from API that no longer exists.
    
    Patch by Geoffrey Garen <ggaren at apple.com> on 2009-10-27
    * bridge/qt/qt_runtime.cpp:
    (JSC::Bindings::convertQVariantToValue):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50194 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b0c8b12..641365f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -3,6 +3,13 @@
         Qt build fix: migrated away from API that no longer exists.
 
         * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::convertQVariantToValue):
+
+2009-10-27  Geoffrey Garen  <ggaren at apple.com>
+
+        Qt build fix: migrated away from API that no longer exists.
+
+        * bridge/qt/qt_runtime.cpp:
         (JSC::Bindings::convertValueToQVariant):
 
 2009-10-27  Oliver Hunt  <oliver at apple.com>
diff --git a/WebCore/bridge/qt/qt_runtime.cpp b/WebCore/bridge/qt/qt_runtime.cpp
index 523cc0e..6887325 100644
--- a/WebCore/bridge/qt/qt_runtime.cpp
+++ b/WebCore/bridge/qt/qt_runtime.cpp
@@ -834,9 +834,7 @@ JSValue convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, con
         dt.isDST = -1;
         double ms = WTF::gregorianDateTimeToMS(dt, time.msec(), /*inputIsUTC*/ false);
 
-        DateInstance* instance = new (exec) DateInstance(exec->lexicalGlobalObject()->dateStructure());
-        instance->setInternalValue(jsNumber(exec, trunc(ms)));
-        return instance;
+        return new (exec) DateInstance(exec, trunc(ms));
     }
 
     if (type == QMetaType::QByteArray) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list