diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-03 15:37:26 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-03 15:37:26 +0100 |
| commit | 80ec5b0367b8e7aedd51ecfac459c53670fc7c35 (patch) | |
| tree | fa1682cd8a96374c1bd919d62b16fa860fb87def /src/core/render_view_context_menu_qt.h | |
| parent | c9c038430bf21909f2038ba66a6c85faf0989dd4 (diff) | |
| parent | 171bdc9f0e9a563b0d70643637d0b6a8e5661d17 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/auto/quick/qquickwebengineview/BLACKLIST
Change-Id: I365daa73d2eb422ac916c32b86c5ad0d3c32086d
Diffstat (limited to 'src/core/render_view_context_menu_qt.h')
0 files changed, 0 insertions, 0 deletions