J-P Nurmi 0fcce50af0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67		2014-06-05 22:26:44 +02:00
..
animation	Fix warning about unused member	2014-03-06 12:21:14 +01: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	Doc: correction link, example and parameter issues qtbase	2014-03-10 16:02:19 +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	Polish the image gestures example.	2014-03-28 12:59:13 +01:00
graphicsview	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
itemviews	simpletreemodel example: rename parent() to parentItem() for clarity	2014-05-25 12:32:56 +02:00
layouts	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
mac	fix qmaccocoaviewcontainer example	2014-06-05 17:11:58 +02:00
mainwindows	Add a menu item to mainwindow example to toggle unified toolbars.	2014-05-21 21:07:58 +02:00
painting	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00
richtext	Use the new unified toolbar implementation in examples on OS X.	2014-05-12 21:40:43 +02: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	Doc: correction link, example and parameter issues qtbase	2014-03-10 16:02:19 +01:00
tutorials	Update AddressBook Example	2014-04-28 13:54:44 +02:00
widgets	Wiggly example: Modernize/compactify code	2014-05-12 18:00:25 +02:00
windowcontainer	Introducing QWidget::createWindowContainer()	2013-01-25 14:11:07 +01:00
widgets.pro	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00