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

Browse Source

Conflicts:
	.qmake.conf

Change-Id: I2005685b95ca394f2f819516c3228e1a1cee1daa

...

This commit is contained in:

Qt Forward Merge Bot 2019-01-22 09:31:11 +01:00

parent 4a86aa5243 a0e8ef6caf

commit c6e1dd505f

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