1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove QWS references from testlib

Browse Source 
Change-Id: Iad52a5c44b27cb11a47987c9f8890cc67b557fb7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Girish Ramakrishnan 2012-06-19 18:22:44 -07:00 committed by Qt by Nokia
parent c7e21f3923
commit fd1b7b4cac
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/testlib/qbenchmarkvalgrind.cpp
View File

@ -195,13 +195,6 @@ bool QBenchmarkValgrindUtils::runCallgrindSubProcess(const QStringList &origAppA
<< QLatin1String("--quiet") << QLatin1String("--quiet")
<< execFile << QLatin1String("-callgrindchild"); << execFile << QLatin1String("-callgrindchild");
#if (defined Q_WS_QWS)
// While running the child process, we aren't processing events, and hence aren't
// acting as the QWS server. Therefore it's necessary to tell the child to act
// as its own server instead of connecting to us.
args << QLatin1String("-qws");
#endif
// pass on original arguments that make sense (e.g. avoid wasting time producing output // pass on original arguments that make sense (e.g. avoid wasting time producing output
// that will be ignored anyway) ... // that will be ignored anyway) ...
for (int i = 1; i < origAppArgs.size(); ++i) { for (int i = 1; i < origAppArgs.size(); ++i) {

4
src/testlib/qtestcase.cpp
View File

@ -1970,9 +1970,6 @@ FatalSignalHandler::FatalSignalHandler()
for (int i = 0; fatalSignals[i]; ++i) { for (int i = 0; fatalSignals[i]; ++i) {
sigaction(fatalSignals[i], &act, &oldact); sigaction(fatalSignals[i], &act, &oldact);
#ifndef Q_WS_QWS
// Don't overwrite any non-default handlers
// however, we need to replace the default QWS handlers
if ( if (
#ifdef SA_SIGINFO #ifdef SA_SIGINFO
oldact.sa_flags & SA_SIGINFO || oldact.sa_flags & SA_SIGINFO ||
@ -1980,7 +1977,6 @@ FatalSignalHandler::FatalSignalHandler()
oldact.sa_handler != SIG_DFL) { oldact.sa_handler != SIG_DFL) {
sigaction(fatalSignals[i], &oldact, 0); sigaction(fatalSignals[i], &oldact, 0);
} else } else
#endif
{ {
sigaddset(&handledSignals, fatalSignals[i]); sigaddset(&handledSignals, fatalSignals[i]);
} }