Frederik Gladhorn 9033977d39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5		2014-01-20 18:18:59 +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-01-20 18:18:59 +01:00
draganddrop	Remove warnings about examples not running in the Qt Simulator	2013-10-09 21:45:31 +02:00
effects	Remove warnings about examples not running in the Qt Simulator	2013-10-09 21:45:31 +02: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	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +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	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
windowcontainer	Introducing QWidget::createWindowContainer()	2013-01-25 14:11:07 +01:00
widgets.pro	Port QMacNativeWidget to Qt 5	2013-09-23 07:18:24 +02:00