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

Browse Source

Conflicts:
	.qmake.conf

Change-Id: I48d89401b174483be79f903a63a99bbe016ec2a2

...

This commit is contained in:

Qt Forward Merge Bot 2019-07-09 03:01:43 +02:00 committed by Edward Welbourne

parent ff5ecc6cc8 10fbcc8ea7

commit 88e2eb6e4b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available