Edward Welbourne 82ea53ad24 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: qmake/library/qmakeevaluator.cpp One side changed the iterator to use ranged-for, the other changed its body; they only conflicted because the latter had to add braces around the body, intruding on the for-line. Trivial resolution. Change-Id: Ib487bc3bd6e3c5225db15f94b9a8f6caaa33456b		2016-07-15 20:47:57 +02:00
..
animation	Unify license header usage.	2016-03-29 10:20:03 +00:00
desktop	Unify license header usage.	2016-03-29 10:20:03 +00:00
dialogs	Unify license header usage.	2016-03-29 10:20:03 +00:00
doc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
draganddrop	Unify license header usage.	2016-03-29 10:20:03 +00: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-06-29 10:10:22 +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-05-06 15:36:44 +02:00
tutorials	Unify license header usage.	2016-03-29 10:20:03 +00:00
widgets	add cross-platform tablet->mouse event synth; enable on Android	2016-04-08 19:33:28 +00: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