Skip to content
GitLab
Commit 14cc4db3 authored by Simon Hausmann's avatar Simon Hausmann
Browse files

Merge remote-tracking branch 'origin/5.9' into dev 

 Conflicts:
	.qmake.conf
	tests/auto/inputpanel/BLACKLIST

Change-Id: Iab123586edb652a8ce14d89736aa13dc3c6203e6
parents 4e42bcc0 a11fd7e4
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 225 additions and 111 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