[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

andreas.kling at nokia.com andreas.kling at nokia.com
Sun Feb 20 23:18:15 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit eae89a4fc81e727baf7a713fcb4aca129727a656
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 20:19:35 2011 +0000

    2011-01-19  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt][WK2] Implement formatLocalizedString() for Qt.
    
            * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
            (WebKit::formatLocalizedString):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76149 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 00a7835..a19808a 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-19  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt][WK2] Implement formatLocalizedString() for Qt.
+
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebKit::formatLocalizedString):
+
 2011-01-19  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
index 4567f35..49b31ef 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
@@ -63,6 +63,13 @@ static String formatLocalizedString(String format, ...)
     RetainPtr<CFStringRef> result(AdoptCF, CFStringCreateWithFormatAndArguments(0, 0, formatCFString.get(), arguments));
     va_end(arguments);
     return result.get();
+#elif PLATFORM(QT)
+    va_list arguments;
+    va_start(arguments, format);
+    QString result;
+    result.vsprintf(format.latin1().data(), arguments);
+    va_end(arguments);
+    return result;
 #else
     notImplemented();
     return format;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list