Skip to content
GitLab
Commit 04b30d97 authored by Michael Bruning's avatar Michael Bruning
Browse files

Merge remote-tracking branch 'origin/5.5' into 5.6 

Conflicts:
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp

Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
parents 1c09b16e 7c5f2a93
Hide whitespace changes
Inline Side-by-side
Showing
with 93 additions and 26 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