Sergio Ahumada 3ef6cf060e Merge branch 'stable' into dev ... Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f		2013-07-11 16:42:01 +02:00
..
image	tst_QIcon: Mark availableSizes() and task223279_inconsistentAddFile() as XFAIL	2013-06-27 23:14:16 +02:00
itemmodels	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
kernel	Merge branch 'stable' into dev	2013-07-11 16:42:01 +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	Merge remote-tracking branch 'origin/stable' into dev	2013-06-27 13:06:38 +02:00
util	Bugfix QDesktopServices on Windows	2013-07-11 10:56:49 +02:00
gui.pro	Move QStandardItem/QStandardItemModel to QtGui	2012-06-29 22:42:19 +02:00