diff options
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 3 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 4 | ||||
| -rw-r--r-- | src/testlib/qxctestlogger.mm | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index e891150330..4435b509be 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -86,6 +86,9 @@ static QSet<QByteArray> keywords() #ifdef Q_OS_IOS << "ios" #endif +#ifdef Q_OS_TVOS + << "tvos" +#endif #ifdef Q_OS_ANDROID << "android" #endif diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 04f51cbb03..bf44049a0e 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1378,7 +1378,9 @@ FatalSignalHandler::FatalSignalHandler() act.sa_flags = SA_RESETHAND; #endif -#ifdef SA_ONSTACK +// tvOS/watchOS both define SA_ONSTACK (in sys/signal.h) but mark sigaltstack() as +// unavailable (__WATCHOS_PROHIBITED __TVOS_PROHIBITED in signal.h) +#if defined(SA_ONSTACK) && !defined(Q_OS_TVOS) // Let the signal handlers use an alternate stack // This is necessary if SIGSEGV is to catch a stack overflow # if defined(Q_CC_GNU) && defined(Q_OF_ELF) diff --git a/src/testlib/qxctestlogger.mm b/src/testlib/qxctestlogger.mm index c50b50eb06..ffabe88db2 100644 --- a/src/testlib/qxctestlogger.mm +++ b/src/testlib/qxctestlogger.mm @@ -191,7 +191,7 @@ private: name:[NSString stringWithFormat:@"%@DidFinishLaunchingNotification", #if defined(Q_OS_OSX) @"NSApplication" - #elif defined(Q_OS_IOS) + #else @"UIApplication" #endif ] |