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
..
qmake.conf	OpenBSD: add X11R6/lib to QMAKE_RPATHDIR	2016-07-13 06:50:00 +00:00
qplatformdefs.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-20 08:00:26 +02:00