diff options
| author | Oswald Buddenhagen <[email protected]> | 2016-08-22 11:30:00 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2016-08-22 11:30:01 +0200 |
| commit | d314819fc02139e05e16c56657898c704f7fb48f (patch) | |
| tree | a61ba968233634948401c8339f9613844de1c2b5 /src/testlib/qtestblacklist.cpp | |
| parent | 9f888d2fde9c5413e5519e0914e9b13638760985 (diff) | |
| parent | e0e9e196a72ffe5457034894eaaadc90ed0d34ef (diff) | |
Merge dev into 5.8
Change-Id: I41ee7b50534b01cf042bed8bb8824ba2e5026a29
Diffstat (limited to 'src/testlib/qtestblacklist.cpp')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 1fa76a692a4..3fec0ad98a1 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -106,6 +106,9 @@ static QSet<QByteArray> keywords() #ifdef Q_OS_TVOS << "tvos" #endif +#ifdef Q_OS_WATCHOS + << "watchos" +#endif #ifdef Q_OS_ANDROID << "android" #endif |