Frederik Gladhorn f4900d340a Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1		2013-02-18 16:14:52 +01:00
..
image	Merge remote-tracking branch 'origin/stable' into dev	2013-02-18 16:14:52 +01:00
itemmodels	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
math3d	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
painting	Fix warning about redefinition of M_PI in tst_qwmatrix.	2013-01-28 09:41:39 +01:00
qopengl	Added QOffscreenSurface class.	2013-02-18 13:42:22 +01:00
text	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +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