Liang Qi d456f87ece Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qfilesystemwatcher_win.cpp src/corelib/plugin/plugin.pri src/plugins/platforms/cocoa/qcocoaaccessibility.mm tests/auto/corelib/tools/qlocale/tst_qlocale.cpp Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1		2016-02-11 08:25:04 +01:00
..
animation	Updated license headers	2016-01-21 18:55:32 +00:00
desktop	Doc: removed double occurrence of systray.qdoc	2016-01-26 09:39:21 +00:00
dialogs	Standarddialogs example: Remove horizontal spacer from fullscreen layout.	2016-02-09 15:24:54 +00:00
doc	Polish the Tablet example	2016-01-28 19:17:08 +00:00
draganddrop	Polish DnD Examples.	2015-10-09 15:59:21 +00:00
effects	Use C++ <cmath> instead of <math.h>	2015-02-16 16:21:15 +00:00
gestures	Examples/Doc snippets: Fix single-character string literals.	2015-10-13 16:37:07 +00:00
graphicsview	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
itemviews	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
layouts	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
mac	Updated license headers	2016-01-21 18:55:32 +00:00
mainwindows	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
painting	Updated license headers	2016-01-21 18:55:32 +00:00
richtext	Updated license headers	2016-01-21 18:55:32 +00:00
scroller	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
statemachine	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
tools	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
tutorials	Examples/Doc snippets: Fix single-character string literals.	2015-10-13 16:37:07 +00:00
widgets	Polish the Tablet example	2016-01-28 19:17:08 +00:00
windowcontainer	Make the windowcontainer example more robust	2015-05-12 08:58:47 +00:00
widgets.pro	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00