Liang Qi a15c3d086d Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/dbus/qdbusconnection_p.h src/dbus/qdbusintegrator.cpp src/dbus/qdbusintegrator_p.h tests/auto/corelib/io/qdir/qdir.pro tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc		2016-01-26 16:27:28 +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: Adapt layout for fullscreen platforms.	2015-12-09 10:22:55 +00:00
doc	Doc: removed double occurrence of systray.qdoc	2016-01-26 09:39:21 +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	Updated license headers	2016-01-21 18:55:32 +00: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	Updated license headers	2016-01-21 18:55:32 +00: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	Image viewer example: Fix broken error message formatting.	2015-10-19 14:50:32 +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