diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 17:02:40 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 17:02:40 +0200 |
commit | 5b909c1fe56f1de48fed1031a030771087d8ab22 (patch) | |
tree | 7fb39c2031baa17f1fdeac5e8f91b43a5a363ef3 /tests/auto | |
parent | f589b8b411f1049f6f2f701478e0c38c72ad824a (diff) | |
parent | ac41ad48cacac91e428181f7ededb0896ee64c40 (diff) |
Merge dev into 5.8
Change-Id: I23aa7e41dfbbb7c4e4259a32868e64c58c0a1310
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/widgets/qwebenginepage/BLACKLIST | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/widgets/qwebenginepage/BLACKLIST b/tests/auto/widgets/qwebenginepage/BLACKLIST index 9900a7345..b1e09777c 100644 --- a/tests/auto/widgets/qwebenginepage/BLACKLIST +++ b/tests/auto/widgets/qwebenginepage/BLACKLIST @@ -8,4 +8,4 @@ osx [getUserMediaRequest] -windows +* |