Frederik Gladhorn 0936bc54f9 Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: config.tests/arch/arch.cpp src/opengl/qgl_qpa.cpp src/widgets/kernel/qapplication.cpp Change-Id: I80b442a4c2c9632743a5b5c7319ff201ec5bc4fd		2014-08-04 09:51:36 +02:00
..
android.prf	Android: Fix compiling targets with space in name	2014-07-08 08:35:49 +02:00
android_deployment_settings.prf	Merge remote-tracking branch 'origin/5.3' into dev	2014-08-04 09:51:36 +02:00