diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-05 16:01:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-05 19:07:18 +0200 |
| commit | 09a0901b4be63e5f74cd0f5337e073890caebbdd (patch) | |
| tree | e8ddfb62a0c7e9ed9e9128f0418a1b796c5af609 /Source/WebKit2/UIProcess | |
| parent | d6ffb6e0ba2941ff69c9b8eaf6ccf383c5d03063 (diff) | |
| parent | 621b83515d7ec0d54a1d77b98033d219abdc6d69 (diff) | |
| download | qtwebkit-09a0901b4be63e5f74cd0f5337e073890caebbdd.tar.gz | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'Source/WebKit2/UIProcess')
| -rw-r--r-- | Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp | 1 |
2 files changed, 1 insertions, 2 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())); diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp index b80613438..93f759f60 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp @@ -506,7 +506,6 @@ void QtWebPageEventHandler::handleInputEvent(const QInputEvent* event) m_isMouseButtonPressed = false; break; case QEvent::MouseButtonDblClick: - ASSERT_NOT_REACHED(); return; default: break; |