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
..
dialogs	Merge remote-tracking branch 'origin/stable' into dev	2013-05-23 21:27:07 +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-05-23 21:27:07 +02:00
kernel	Fix typo	2013-06-03 13:00:32 +02:00
styles	Fix tst_qstyle autotest build for WEC7.	2013-04-17 19:49:02 +02:00
util	Stabilize tst_qcompleter.	2013-04-05 11:28:47 +02:00
widgets	Add QComboBox::currentData	2013-05-27 15:19:41 +02:00
widgets.pro	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00