Liang Qi b94773c9c8 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: config.tests/unix/compile.test src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/testlib/qtestcase.cpp src/testlib/qtestcase.qdoc Change-Id: Ied3c471dbc9a076c8de33d673bd557e88575609d		2016-04-13 06:55:37 +02:00
..
opengles2.cpp	Updated license headers	2016-01-15 12:25:24 +00:00
opengles2.pro	Adjust egl config.test to pass sysrooted libs	2016-04-08 23:37:07 +00:00