diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2018-12-14 13:15:31 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-18 15:58:19 +0100 |
| commit | 50fac0d1d7e82f2423e0a3e557b4a1f30be5bf33 (patch) | |
| tree | b085f03fdafa4ecbcfcb5a96b68404e155879b6a /tests/auto/quick/qquickwebenginedefaultsurfaceformat/BLACKLIST | |
| parent | 8124f0bc1893e0997989913044665fa1c5cf79d7 (diff) | |
| parent | 4f1e0003d98116e33a847360e0e95c46daae25fc (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/core/compositor/delegated_frame_node.cpp
src/core/profile_adapter.cpp
src/core/profile_io_data_qt.cpp
src/webengine/api/qquickwebengineprofile.cpp
src/webenginewidgets/api/qwebengineprofile.cpp
Change-Id: I35ec8480e758bbcb6c5942a5401cb1b6dbdcc428
Diffstat (limited to 'tests/auto/quick/qquickwebenginedefaultsurfaceformat/BLACKLIST')
| -rw-r--r-- | tests/auto/quick/qquickwebenginedefaultsurfaceformat/BLACKLIST | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/BLACKLIST b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/BLACKLIST deleted file mode 100644 index a48edeeab..000000000 --- a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/BLACKLIST +++ /dev/null @@ -1,4 +0,0 @@ -[javascriptClipboard:default] -opensuse-leap -[javascriptClipboard:canPaste] -opensuse-leap |