Samuel Rødal 2ab9b747fc Merge remote-tracking branch 'gerrit/release' into stable ... Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0		2013-03-21 08:49:01 +01:00
..
image	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
itemmodels	Fix warning about tautological comparison in tst_qstandarditem (CLANG).	2013-03-06 21:50:28 +01:00
kernel	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
math3d	Add convenience distance methods to QVector2D	2013-03-18 08:36:03 +01:00
painting	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
qopengl	Added QOffscreenSurface class.	2013-02-18 13:42:22 +01:00
text	Fix the font engines leaking	2013-03-20 07:02:29 +01:00
util	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
gui.pro	Move QStandardItem/QStandardItemModel to QtGui	2012-06-29 22:42:19 +02:00