Simon Hausmann 015002fec9 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: doc/global/template/style/online.css mkspecs/android-g++/qmake.conf Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61		2014-12-10 07:58:06 +01:00
..
qwindow.pro	Fix linking of tst_qwindow with dynamic Open GL.	2014-09-08 21:43:06 +02:00
tst_qwindow.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-10 07:58:06 +01:00