Commit 092842b5 authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen
Browse files

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
parents c8bb939e 7644564d
Showing with 207 additions and 59 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment