diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-11 17:18:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-11 18:34:14 +0200 |
commit | 6c2a111f8c82b56388abf409a61a3e0d56a52156 (patch) | |
tree | 0f5a7ad320f034233c065fc994980b10afe434ad /tests/auto/widgets/qwebenginepage/BLACKLIST | |
parent | c4fc323d0771e24ae726065cdce9eafef2c09c41 (diff) | |
parent | d6e3ba85138a6147b9b34a1c3363b2d3b20ba284 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
Diffstat (limited to 'tests/auto/widgets/qwebenginepage/BLACKLIST')
-rw-r--r-- | tests/auto/widgets/qwebenginepage/BLACKLIST | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/widgets/qwebenginepage/BLACKLIST b/tests/auto/widgets/qwebenginepage/BLACKLIST index b48e77a50..fcd36ba83 100644 --- a/tests/auto/widgets/qwebenginepage/BLACKLIST +++ b/tests/auto/widgets/qwebenginepage/BLACKLIST @@ -1,8 +1,2 @@ [macCopyUnicodeToClipboard] osx - -[getUserMediaRequest] -windows - -[setHtmlWithImageResource] -* |