[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

zoltan at webkit.org zoltan at webkit.org
Wed Dec 22 12:17:20 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ae6b8f702a8e0def577b6a10e0d72964c8380209
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 12:15:23 2010 +0000

    2010-08-18  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Forwards QtWebProcess' stdout, stderr onto the UI process
            https://bugs.webkit.org/show_bug.cgi?id=44159
    
            For debugging purposes forwards stdout and stderr of QtWebProcess onto the UI process.
    
            * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
            (WebKit::ProcessLauncherHelper::launch):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65601 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0a366e9..2920237 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-18  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Forwards QtWebProcess' stdout, stderr onto the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=44159
+
+        For debugging purposes forwards stdout and stderr of QtWebProcess onto the UI process.
+
+        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+        (WebKit::ProcessLauncherHelper::launch):
+
 2010-08-17  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp b/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
index 2941c08..6040f92 100644
--- a/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
+++ b/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
@@ -68,6 +68,7 @@ void ProcessLauncherHelper::launch(WebKit::ProcessLauncher* launcher)
     QString program("QtWebProcess " + m_server.serverName());
 
     QProcess* webProcess = new QProcess();
+    webProcess->setProcessChannelMode(QProcess::ForwardedChannels);
     webProcess->start(program);
 
     if (!webProcess->waitForStarted()) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list