diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-27 11:25:29 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-27 11:25:29 +0100 |
| commit | 01d4c6440b52f2ce26ced45b6ad193e909db44af (patch) | |
| tree | adf466a63806aa8a9c504642f17a2466a945232a /tests/auto/widgets/qwebengineprofile/BLACKLIST | |
| parent | 2d8d15047fdbf046cdee9fba103587c19808d7d2 (diff) | |
| parent | df5d831bae99662fab43ed2628187113c18aac2c (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/core/renderer_host/web_channel_ipc_transport_host.cpp
tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
Change-Id: I47f2b893bc9f27cd9df641f76badc9e53b482ad4
Diffstat (limited to 'tests/auto/widgets/qwebengineprofile/BLACKLIST')
| -rw-r--r-- | tests/auto/widgets/qwebengineprofile/BLACKLIST | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/widgets/qwebengineprofile/BLACKLIST b/tests/auto/widgets/qwebengineprofile/BLACKLIST deleted file mode 100644 index 55806eec4..000000000 --- a/tests/auto/widgets/qwebengineprofile/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -[disableCache] -* - |