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

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b5b8e228d51dd4305a841d4a6664c8f52f5457fc
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 16:52:05 2010 +0000

    2010-08-31  Andras Becsi  <abecsi at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Determine application path of MiniBrowser at runtime and use that path
            for QtWebProcess if the executable exists in that path.
    
            * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
            (WebKit::ProcessLauncherHelper::launch):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66493 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 68d1144..f4eb5b1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-31  Andras Becsi  <abecsi at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Determine application path of MiniBrowser at runtime and use that path
+        for QtWebProcess if the executable exists in that path.
+
+        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+        (WebKit::ProcessLauncherHelper::launch):
+
 2010-08-31  Zoltan Horvath  <zoltan at webkit.org>
 
         Build fix after r66448 on WebKit2.
diff --git a/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp b/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
index 6040f92..465f810 100644
--- a/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
+++ b/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
@@ -37,6 +37,7 @@
 
 #include <QApplication>
 #include <QDebug>
+#include <QFile>
 #include <QLocalServer>
 #include <QProcess>
 
@@ -65,7 +66,15 @@ private:
 
 void ProcessLauncherHelper::launch(WebKit::ProcessLauncher* launcher)
 {
-    QString program("QtWebProcess " + m_server.serverName());
+    QString applicationPath = "%1 %2";
+
+    if (QFile::exists(QCoreApplication::applicationDirPath() + "/QtWebProcess")) {
+        applicationPath = applicationPath.arg(QCoreApplication::applicationDirPath() + "/QtWebProcess");
+    } else {
+        applicationPath = applicationPath.arg("QtWebProcess");
+    }
+
+    QString program(applicationPath.arg(m_server.serverName()));
 
     QProcess* webProcess = new QProcess();
     webProcess->setProcessChannelMode(QProcess::ForwardedChannels);

-- 
WebKit Debian packaging