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
..
main.cpp	Updated license headers	2016-01-21 18:55:32 +00:00
pathstroke.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
pathstroke.h	Updated license headers	2016-01-21 18:55:32 +00:00
pathstroke.html	…
pathstroke.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
pathstroke.qrc	…