Simon Hausmann b2603b7665 Merge remote-tracking branch 'origin/5.5' into HEAD ... Conflicts: src/plugins/platforms/windows/qwindowsopengltester.cpp Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe		2015-07-17 16:35:42 +02:00
..
.gitignore
qtimer.pro	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
tst_qtimer.cpp	Merge remote-tracking branch 'origin/5.5' into HEAD	2015-07-17 16:35:42 +02:00