Frederik Gladhorn e2776b44a0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb		2013-06-12 19:17:07 +02:00
..
animation	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
desktop	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
dialogs	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
doc	docs: DirView example uses QFileSystemModel not QDirModel	2013-05-31 17:46:08 +02:00
draganddrop	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
effects	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
graphicsview	Merge remote-tracking branch 'origin/release' into stable	2013-04-03 15:43:39 +02:00
itemviews	QAbstractScrollArea - add SizeAdjustPolicy and viewportSizeHint	2013-04-22 17:56:55 +02:00
layouts	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mainwindows	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
painting	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
richtext	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
scroller	Fix warning about float truncation in scroller example (CLANG).	2013-03-06 21:50:28 +01:00
statemachine	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
tools	fix processing order for qmake -r	2013-04-19 20:10:46 +02:00
tutorials	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-05-23 21:27:07 +02:00
windowcontainer	Introducing QWidget::createWindowContainer()	2013-01-25 14:11:07 +01:00
widgets.pro	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00