[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5b554947e835fb583090db8f27a661147bd200b1
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 8 18:30:16 2010 +0000

    [Qt] Set stdout/stderr to binary mode for DRT on Windows
    
    Reviewed by Kenneth Rohde Christiansen.
    
    This makes sure we don't end up with lots of CRLFs in the
    DRT output, which breaks tons of results. Matches what
    the Windows DRT does.
    
    * DumpRenderTree/qt/main.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54496 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 035a0bc..74c3c23 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [Qt] Set stdout/stderr to binary mode for DRT on Windows
+
+        This makes sure we don't end up with lots of CRLFs in the
+        DRT output, which breaks tons of results. Matches what
+        the Windows DRT does.
+
+        * DumpRenderTree/qt/main.cpp:
+
+2010-02-08  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         Build fix for Qt on Windows.
 
         Don't use noreturn directly since it's a gcc attribute.
diff --git a/WebKitTools/DumpRenderTree/qt/main.cpp b/WebKitTools/DumpRenderTree/qt/main.cpp
index 69d3c23..efcda57 100644
--- a/WebKitTools/DumpRenderTree/qt/main.cpp
+++ b/WebKitTools/DumpRenderTree/qt/main.cpp
@@ -48,6 +48,11 @@
 #include <fontconfig/fontconfig.h>
 #endif
 
+#ifdef Q_OS_WIN
+#include <io.h>
+#include <fcntl.h>
+#endif
+
 #include <limits.h>
 #include <signal.h>
 
@@ -101,6 +106,11 @@ static NO_RETURN void crashHandler(int sig)
 
 int main(int argc, char* argv[])
 {
+#ifdef Q_OS_WIN
+    _setmode(1, _O_BINARY);
+    _setmode(2, _O_BINARY);
+#endif
+
 #ifdef Q_WS_X11
     FcInit();
     WebCore::DumpRenderTree::initializeFonts();

-- 
WebKit Debian packaging