Liang Qi e32f1a4d61 Merge remote-tracking branch 'origin/5.6' into 5.7 ... And blacklisted a few tests in tst_QUdpSocket. Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtNative.java src/corelib/global/qglobal.cpp src/corelib/global/qsystemdetection.h src/corelib/io/qfileselector.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp tests/auto/network/socket/qudpsocket/BLACKLIST Task-number: QTBUG-54205 Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6		2016-06-20 08:00:26 +02:00
..
unixmake2.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
unixmake.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-20 08:00:26 +02:00
unixmake.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00