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

Browse Source

Conflicts:
	.qmake.conf

Change-Id: I88de56f107b431f786e2561d265d476ee8899fb7

...

This commit is contained in:

Qt Forward Merge Bot 2018-11-16 13:25:22 +01:00

parent 1ad75d1169 7b091d13ed

commit a8c1b85b91

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