Skip to content
GitLab
Commit b30052fa authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot
Browse files

Merge remote-tracking branch 'origin/5.14' into 5.15 

 Conflicts:
	.qmake.conf

Change-Id: I1deed2698132ead4d8553558dd3614e8e063afd3
parents 8de0ce0b 553b62ba
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 0 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