Skip to content
GitLab
Commit b04131f3 authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.7' into 5.8 

Conflicts:
	src/3rdparty
	src/core/delegated_frame_node.h
	src/webengine/api/qquickwebenginecontextmenudata.cpp

Change-Id: I163488d0d32cd981351608b2886f12e547e24672
parents 001ee1d6 0e5553a1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 201 additions and 39 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