Liang Qi 0ca4fcbc36 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/xcb/qxcbintegration.cpp Change-Id: I2d71d06a55f730df19ace0dd3304238584a0497f		2016-08-18 11:07:51 +02:00
..
qmake.conf	Revert "Android: use gold linker"	2016-08-16 13:31:38 +00:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00