diff options
| author | Tor Arne Vestbø <torarnv@gmail.com> | 2020-04-03 12:45:36 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <torarnv@gmail.com> | 2020-04-03 13:44:37 +0200 |
| commit | ab4c22d47d196d5eb28fc16cd7262c77bcb6875f (patch) | |
| tree | 29022a8bdd5849cd6d0e9755063c449110b8686d /src/testlib | |
| parent | 7e7c6498841cb4e5a5b4454424a374b70bb111d9 (diff) | |
macOS: Remove all use of deprecated Q_OS_OSX define
Change-Id: I49c285604694c93d37c9d1c7cd6d3b1509858319
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qxctestlogger.mm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 9b7c2495d4..f9ccde0280 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -102,7 +102,7 @@ static QSet<QByteArray> keywords() #ifdef Q_OS_LINUX << "linux" #endif -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS << "osx" << "macos" #endif diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 20c370dc38..f45999c7fa 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -231,7 +231,7 @@ static void stackTrace() if (system(cmd) == -1) fprintf(stderr, "calling gdb failed\n"); fprintf(stderr, "=== End of stack trace ===\n"); -#elif defined(Q_OS_OSX) +#elif defined(Q_OS_MACOS) char cmd[512]; qsnprintf(cmd, 512, "lldb -p %d 2>/dev/null <<EOF\n" "bt all\n" diff --git a/src/testlib/qxctestlogger.mm b/src/testlib/qxctestlogger.mm index 9fa9da2fdd..d9e56cf542 100644 --- a/src/testlib/qxctestlogger.mm +++ b/src/testlib/qxctestlogger.mm @@ -189,7 +189,7 @@ private: // Prevent XCTestProbe from re-launching runTests on application startup [[NSNotificationCenter defaultCenter] removeObserver:[XCTestProbe class] name:[NSString stringWithFormat:@"%@DidFinishLaunchingNotification", - #if defined(Q_OS_OSX) + #if defined(Q_OS_MACOS) @"NSApplication" #else @"UIApplication" |