Frederik Gladhorn 5c23199d4e Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a		2013-08-14 09:06:31 +02:00
..
dialogs	Merge remote-tracking branch 'origin/stable' into dev	2013-08-14 09:06:31 +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-08-14 09:06:31 +02:00
itemviews	Merge remote-tracking branch 'origin/stable' into dev	2013-08-14 09:06:31 +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	Fix QCompleter::activated(QModelIndex)	2013-08-07 18:21:23 +02:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-08-14 09:06:31 +02:00
widgets.pro	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00