Frederik Gladhorn 2eb26c1709 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/gui/text/qfontdatabase.cpp Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d		2014-10-27 13:00:36 +01:00
..
image	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00
itemmodels	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
kernel	Fix QOpenGLWindow tests when devicePixelRatio != 1	2014-10-20 10:11:25 +02:00
math3d	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
painting	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00
qopengl	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
text	Merge remote-tracking branch 'origin/5.4' into dev	2014-10-27 13:00:36 +01:00
util	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
gui.pro	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00