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
..
dialogs	Merge remote-tracking branch 'origin/stable' into dev	2013-06-27 13:06:38 +02:00
effects	QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-28 02:02:14 +01:00
graphicsview	Merge remote-tracking branch 'origin/stable' into dev	2013-06-04 19:34:36 +02:00
itemviews	Merge remote-tracking branch 'origin/stable' into dev	2013-06-20 16:45:12 +02:00
kernel	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
styles	Test password mask delay and characters on Mac.	2013-07-11 10:56:49 +02:00
util	Stabilize tst_qcompleter.	2013-04-05 11:28:47 +02:00
widgets	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
widgets.pro	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00