diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-03-26 19:24:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-26 20:17:45 +0100 |
| commit | 8d01ff3bac8724285bda5abf2c6f96e1cbdd042f (patch) | |
| tree | 3e33f1d426a4d2c8f06f3d2dab1a6a9b7ab380c9 /Source/WebKit2/UIProcess | |
| parent | 9594f0b29a6e36f14997e347fa0642c4ea969d44 (diff) | |
| download | qtwebkit-8d01ff3bac8724285bda5abf2c6f96e1cbdd042f.tar.gz | |
Fails to start QtWebProcess.exe if installed in a path containing spaces https://bugs.webkit.org/show_bug.cgi?id=113328
We use QProcess::start() with a commandline string to start the web process
and the string is treated by QProcess as a whitespace delimeted list of the
command and the arguments, thus we have to escape the path to the web process
binary so that if the path contains spaces we still run the appropriate command.
* UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
(WebKit::ProcessLauncher::launchProcess):
Task-number: QTBUG-30249
Change-Id: Ic72cc58d57201381e0b269ff26edf97fea998bbe
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess')
| -rw-r--r-- | Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp b/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp index 0b6ee1bd5..75a7aa725 100644 --- a/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp +++ b/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp @@ -109,7 +109,7 @@ void QtWebProcess::setupChildProcess() void ProcessLauncher::launchProcess() { - QString commandLine = QLatin1String("%1 %2 %3"); + QString commandLine = QLatin1String("%1 \"%2\" %3"); if (m_launchOptions.processType == WebProcess) { QByteArray webProcessPrefix = qgetenv("QT_WEBKIT2_WP_CMD_PREFIX"); commandLine = commandLine.arg(QLatin1String(webProcessPrefix.constData())).arg(QString(executablePathOfWebProcess())); |