Commit 192a5ec7 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: Icc838b713efe15ffa38dc1fc0ad90c37e9fa7c6c
parents 5b1f4d03 e567b9d8
Showing with 0 additions and 0 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