Frederik Gladhorn a9c88c1f39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/image/qimage.cpp src/gui/text/qtextengine.cpp src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/printsupport/kernel/qprintengine_win.cpp Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444		2014-02-12 16:28:07 +01:00
..
animation	stickman example: fix header include guard	2013-09-16 21:30:54 +02:00
desktop	Remove warnings about examples not running in the Qt Simulator	2013-10-09 21:45:31 +02:00
dialogs	Remove warnings about examples not running in the Qt Simulator	2013-10-09 21:45:31 +02:00
doc	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
draganddrop	Remove warnings about examples not running in the Qt Simulator	2013-10-09 21:45:31 +02:00
effects	Fix MSVC-warnings about stray */* in sources.	2014-01-24 18:50:05 +01:00
gestures	Doc: corrected link/example errors	2014-01-31 16:18:07 +01:00
graphicsview	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
itemviews	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
layouts	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
mac	QMacNativeWidget: Have example use a delegate	2013-09-26 22:25:10 +02:00
mainwindows	widgets/mainwindows/mainwindow example: Use mouse release event for dock title.	2014-02-07 22:12:10 +01:00
painting	Remove qSort usages from qtbase examples	2013-09-14 13:12:40 +02:00
richtext	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
scroller	Fix warning about float truncation in scroller example (CLANG).	2013-03-06 21:50:28 +01:00
statemachine	Remove warnings about examples not running in the Qt Simulator	2013-10-09 21:45:31 +02:00
tools	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
tutorials	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
windowcontainer	Introducing QWidget::createWindowContainer()	2013-01-25 14:11:07 +01:00
widgets.pro	Doc: corrected link/example errors	2014-01-31 16:18:07 +01:00