[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
kenneth at webkit.org
kenneth at webkit.org
Thu Dec 3 13:36:14 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit a14342e76f85fd335356ea1e45efac7c687a3f9d
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 13 20:04:24 2009 +0000
Set the locale to C and not to the current one in use on the system.
Reviewed by Simon Hausmann.
* DumpRenderTree/qt/DumpRenderTree.cpp:
(WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50959 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d591511..ec1b6d5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-13 Kenneth Rohde Christiansen <kenneth at webkit.org>
+
+ Reviewed by Simon Hausmann.
+
+ Set the locale to C and not to the current one in use on the system.
+
+ * DumpRenderTree/qt/DumpRenderTree.cpp:
+ (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
2009-11-13 Adam Roben <aroben at apple.com>
Finish replacing worldIDs with world objects
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index 1d8e8f6..6166a57 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -304,8 +304,8 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting()
m_page->undoStack()->clear();
- QLocale qlocale;
- QLocale::setDefault(qlocale);
+ QLocale::setDefault(QLocale::c());
+ setlocale(LC_ALL, "");
}
void DumpRenderTree::open(const QUrl& aurl)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list