Liang Qi 7f269a5db8 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: .qmake.conf Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839		2017-07-06 13:54:25 +02:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.9' into dev	2017-07-06 13:54:25 +02:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00