Liang Qi 5cfb80a28e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/angle/src/libGLESv2/libGLESv2.pro src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp Change-Id: If8da4cfe8f57fea9f78e7239f378a6302c01674e		2016-06-23 10:29:37 +02:00
..
qmake.conf
qplatformdefs.h