Frederik Gladhorn aaff94c2df Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79		2014-12-29 16:37:38 +01:00
..
animation	New Qt logo	2014-11-05 08:10:42 +01:00
desktop	Balloon tip must follow systemtray icon	2014-09-25 16:12:55 +02:00
dialogs	Examples: Add Q_DECL_OVERRIDE to overridden functions	2014-07-15 08:44:44 +02:00
doc	New Qt logo	2014-11-05 08:10:42 +01:00
draganddrop	New Qt logo	2014-11-05 08:10:42 +01:00
effects	Examples: Add Q_DECL_OVERRIDE to overridden functions	2014-07-15 08:44:44 +02:00
gestures	QCommandLineParser: Show usage and errors in message boxes on Windows.	2014-11-27 09:34:29 +01:00
graphicsview	New Qt logo	2014-11-05 08:10:42 +01:00
itemviews	Remove a memory leak in the custom sort filter model example	2014-12-23 16:39:03 +01:00
layouts	Examples: Add Q_DECL_OVERRIDE to overridden functions	2014-07-15 08:44:44 +02:00
mac	fix qmaccocoaviewcontainer example	2014-06-05 17:11:58 +02:00
mainwindows	Polish the mdi example.	2014-09-24 23:07:25 +02:00
painting	New Qt logo	2014-11-05 08:10:42 +01:00
richtext	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
scroller	Examples: Add Q_DECL_OVERRIDE to overridden functions	2014-07-15 08:44:44 +02:00
statemachine	Examples: Add Q_DECL_OVERRIDE to overridden functions	2014-07-15 08:44:44 +02:00
tools	Doc: corrected autolink errors corelib/io	2014-11-26 10:47:46 +01:00
tutorials	Examples: Add Q_DECL_OVERRIDE to overridden functions	2014-07-15 08:44:44 +02:00
widgets	New Qt logo	2014-11-05 08:10:42 +01:00
windowcontainer	Examples: Add Q_DECL_OVERRIDE to overridden functions	2014-07-15 08:44:44 +02:00
widgets.pro	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00