Commit 01dce2df authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen
Browse files

Merge remote-tracking branch 'origin/5.12' into 5.13

Conflicts:
	.qmake.conf
	src/3rdparty
	src/core/render_widget_host_view_qt.cpp
	src/core/web_contents_view_qt.h
	src/core/web_engine_context.cpp

Change-Id: I17f3a4814e88a5680dc61a6d734c171ccba00e8c
parents c68c8cb2 dad0cfa3
Showing with 43 additions and 10 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