summaryrefslogtreecommitdiffstats
path: root/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp')
-rw-r--r--Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp b/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
index 1e7e14a..cae5bdf 100644
--- a/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
+++ b/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
@@ -75,18 +75,22 @@ protected:
void QtWebProcess::setupChildProcess()
{
#if defined Q_OS_LINUX
+#ifndef NDEBUG
+ if (getenv("QT_WEBKIT_KEEP_ALIVE_WEB_PROCESS"))
+ return;
+#endif
prctl(PR_SET_PDEATHSIG, SIGKILL);
#endif
}
void ProcessLauncher::launchProcess()
{
- QString applicationPath = "%1 %2";
+ QString applicationPath = QLatin1String("%1 %2");
- if (QFile::exists(QCoreApplication::applicationDirPath() + "/QtWebProcess")) {
- applicationPath = applicationPath.arg(QCoreApplication::applicationDirPath() + "/QtWebProcess");
+ if (QFile::exists(QCoreApplication::applicationDirPath() + QLatin1String("/QtWebProcess"))) {
+ applicationPath = applicationPath.arg(QCoreApplication::applicationDirPath() + QLatin1String("/QtWebProcess"));
} else {
- applicationPath = applicationPath.arg("QtWebProcess");
+ applicationPath = applicationPath.arg(QLatin1String("QtWebProcess"));
}
int sockets[2];