diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 13:48:44 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-02 14:30:46 +0100 |
| commit | 092842b5e00662ae9888a19326a9fe4cf140f4da (patch) | |
| tree | 1ebf6cf6adacf07425ea92f3d62588e01269975b /tests/auto/quick/qmltests/BLACKLIST | |
| parent | c8bb939e7e45214f17daf8f576582e5bff2527ea (diff) | |
| parent | 7644564d754bbee640a091950b77e23586c2d283 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/core/download_manager_delegate_qt.cpp
src/core/download_manager_delegate_qt.h
src/core/render_widget_host_view_qt.cpp
src/core/web_contents_adapter.cpp
src/webengine/api/qquickwebengineview.cpp
tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp
Change-Id: I2308414ce257ae5bb0fc9f6493aa111a267ff39b
Diffstat (limited to 'tests/auto/quick/qmltests/BLACKLIST')
| -rw-r--r-- | tests/auto/quick/qmltests/BLACKLIST | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST index 54a3185d6..74e3adf53 100644 --- a/tests/auto/quick/qmltests/BLACKLIST +++ b/tests/auto/quick/qmltests/BLACKLIST @@ -1,4 +1,3 @@ -osx-10.11 ci [WebViewGeopermission::test_deniedGeolocationByUser] osx |