diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-30 01:00:07 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-30 01:00:07 +0100 |
commit | 0a7302abbc47a0db25f119ee4f5144bbaf0d9d6f (patch) | |
tree | e4b05a56e09bb6401a9ee863725da2f0e52858f1 /tests | |
parent | 8d154810f56b9d831f78f454fb2b05e98c246313 (diff) | |
parent | 20b7e18146e28e73cba52a63a3415c6828f1f6f5 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9935bacae0d6ba532418fc3d28adbc7ca1463604
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/network/kernel/qhostinfo/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/network/kernel/qhostinfo/BLACKLIST b/tests/auto/network/kernel/qhostinfo/BLACKLIST index 87c5fe991f..cd4d4eb03c 100644 --- a/tests/auto/network/kernel/qhostinfo/BLACKLIST +++ b/tests/auto/network/kernel/qhostinfo/BLACKLIST @@ -4,3 +4,5 @@ windows ci [blockingLookup:a-plus-aaaa] windows ci +[reverseLookup:google-public-dns-a.google.com] +ci diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST new file mode 100644 index 0000000000..e760042def --- /dev/null +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-74760 +[sorting] +opensuse-42.3 |