Liang Qi 6b8f422c5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03		2016-08-13 01:05:02 +02:00
..
animation	Unify license header usage.	2016-03-29 10:20:03 +00:00
desktop	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
dialogs	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-05 08:58:48 +02:00
doc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
draganddrop	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-10 17:43:13 +02:00
effects	Unify license header usage.	2016-03-29 10:20:03 +00:00
gestures	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-07 10:47:20 +02:00
graphicsview	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00
itemviews	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
layouts	Unify license header usage.	2016-03-29 10:20:03 +00:00
mac	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
mainwindows	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-01 10:03:21 +02:00
painting	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
richtext	Unify license header usage.	2016-03-29 10:20:03 +00:00
scroller	Unify license header usage.	2016-03-29 10:20:03 +00:00
statemachine	Unify license header usage.	2016-03-29 10:20:03 +00:00
tools	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-05 08:58:48 +02:00
tutorials	Unify license header usage.	2016-03-29 10:20:03 +00:00
widgets	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-10 17:43:13 +02:00
windowcontainer	Unify license header usage.	2016-03-29 10:20:03 +00:00
widgets.pro	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00