Frederik Gladhorn ca524e5b70 Merge remote-tracking branch 'origin/5.3' into 5.4 ... Manually included changes from 3a347a4e70 in src/opengl/qgl.cpp. Conflicts: src/opengl/qgl_qpa.cpp src/plugins/platforms/android/androidjnimain.cpp Change-Id: Ic26b58ee587d4884c9d0fba45c5a94b5a45ee929		2014-08-12 13:05:02 +02:00
..
qstate	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
qstatemachine	Merge remote-tracking branch 'origin/5.3' into 5.4	2014-08-12 13:05:02 +02:00
statemachine.pro	Moving relevant tests to corelib/statemachine	2011-09-01 12:54:42 +02:00