Skip to content
GitLab
Commit d7a5dc0c authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/5.3' into 5.4.0 

Conflicts:
	src/plugins/platforms/xcb/qxcbwindow.cpp

Change-Id: Iad9ef6bf7d6111efba8232a7d9b46bb9974912f5
parents 3d70925e 73a1e8c6
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 80 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