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

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

 Conflicts:
	.qmake.conf

Change-Id: I0724ca9ffbb8099f698b090a4fdd993fad2c2302
parents c134f720 1688c44d
No related merge requests found
Showing with 88 additions and 15 deletions
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