diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /Tools/WebKitTestRunner/qt/main.cpp | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
| download | qtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Tools/WebKitTestRunner/qt/main.cpp')
| -rw-r--r-- | Tools/WebKitTestRunner/qt/main.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Tools/WebKitTestRunner/qt/main.cpp b/Tools/WebKitTestRunner/qt/main.cpp index 3eb287310..d6d228091 100644 --- a/Tools/WebKitTestRunner/qt/main.cpp +++ b/Tools/WebKitTestRunner/qt/main.cpp @@ -30,6 +30,10 @@ #include "qquickwebview_p.h" #include <stdio.h> +#if !defined(NDEBUG) && defined(Q_OS_UNIX) +#include <signal.h> +#include <unistd.h> +#endif #include <QApplication> #include <QObject> @@ -63,6 +67,12 @@ private: char** m_argv; }; +#if !defined(NDEBUG) && defined(Q_OS_UNIX) +static void sigcontHandler(int) +{ +} +#endif + void messageHandler(QtMsgType type, const char* message) { if (type == QtCriticalMsg) { @@ -77,8 +87,14 @@ int main(int argc, char** argv) { #if !defined(NDEBUG) && defined(Q_OS_UNIX) if (qgetenv("QT_WEBKIT_PAUSE_UI_PROCESS") == "1") { - fprintf(stderr, "Pausing UI process, please attach to PID %d and continue... ", getpid()); + struct sigaction newAction, oldAction; + newAction.sa_handler = sigcontHandler; + sigemptyset(&newAction.sa_mask); + newAction.sa_flags = 0; + sigaction(SIGCONT, &newAction, &oldAction); + fprintf(stderr, "Pausing UI process, please attach to PID %d and send signal SIGCONT... ", getpid()); pause(); + sigaction(SIGCONT, &oldAction, 0); fprintf(stderr, " OK\n"); } #endif |