Commit 32c0ebbc authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot Committed by Edward Welbourne
Browse files

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

 Conflicts:
	.qmake.conf

Change-Id: I031206ba9e10a1dd4a8a7887ec3f8a2a9a53ffde
parents 8d191720 1efe161a
Branches
Tags v5.4.0-alpha1
No related merge requests found
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