diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-22 01:00:26 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-22 01:00:27 +0100 |
| commit | 64085d9b2f5ca45139ce582e212e0a416b9215fb (patch) | |
| tree | e1f08f620753fc12ab66a09ab83229796bbe6e52 /src/testlib/qtestblacklist.cpp | |
| parent | b5c16921cca0d5ae966a36cb451ec0b322b967ed (diff) | |
| parent | 1136c9849e26423f72d7a0a7a92be8c93c13d7a6 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9e7cb1b131b7b216aad8ed1b1536669fd1557c21
Diffstat (limited to 'src/testlib/qtestblacklist.cpp')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 84a99c10f3..886f1f75b9 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -104,6 +104,7 @@ static QSet<QByteArray> keywords() #endif #ifdef Q_OS_OSX << "osx" + << "macos" #endif #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) << "windows" |