diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:01:01 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:01:02 +0100 |
commit | 4b0af2cdbf61572b22ea6b8aa17fc9f52c71ac4b (patch) | |
tree | 60fb25a6772f5ac2d26af005b9888ff09c08a6c1 /src/testlib/qtestcase.cpp | |
parent | cff492fed1d98f45c4c1f4011f1451120c0d1c23 (diff) | |
parent | 36e277e91732d6d75fb6d9cb691fe9c0f83f6178 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I68a6ed3184e62fa89c47c564bb01002c0918d0fd
Diffstat (limited to 'src/testlib/qtestcase.cpp')
-rw-r--r-- | src/testlib/qtestcase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index fdc909e7e9..7b407c9073 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1528,7 +1528,7 @@ void TestMethods::invokeTests(QObject *testObject) const QTestResult::setCurrentTestFunction(nullptr); } -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && !defined(Q_OS_WASM) class FatalSignalHandler { public: @@ -1928,7 +1928,7 @@ int QTest::qRun() } else #endif { -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && !defined(Q_OS_WASM) QScopedPointer<FatalSignalHandler> handler; if (!noCrashHandler) handler.reset(new FatalSignalHandler); |