Commit 6e1be78c authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot
Browse files

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

 Conflicts:
	.qmake.conf

Change-Id: I57c453a4f844e7e47f06bb6e2f13498e2989972b
parents 9c0e794c 2c681d20
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