82ea53ad24
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 |
||
|---|---|---|
| .. | ||
| animation | ||
| codecs | ||
| global | ||
| io | ||
| itemmodels | ||
| json | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| statemachine | ||
| thread | ||
| tools | ||
| xml | ||
| corelib.pro | ||