Frederik Gladhorn 80604a0786 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa		2013-06-04 19:34:36 +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	gui/kernel: Do not run test showing windows in parallel.	2013-05-30 19:33:25 +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	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01: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