Frederik Gladhorn e2776b44a0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb		2013-06-12 19:17:07 +02:00
..
image	Disabled test on WINCE.	2013-05-27 02:45:21 +02:00
itemmodels	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2013-06-12 19:17:07 +02:00
math3d	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
painting	Make QColor understand #AARRGGBB	2013-04-26 09:59:04 +02:00
qopengl	test: Mark tst_qopengl as insignificant on Win7 + Angle	2013-06-07 18:07:26 +02:00
text	Make QColor understand #AARRGGBB	2013-04-26 09:59:04 +02:00
util	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
gui.pro	Move QStandardItem/QStandardItemModel to QtGui	2012-06-29 22:42:19 +02:00