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

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
index 7bd732379d..c212589f59 100644
--- a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
+++ b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
@@ -206,9 +206,9 @@ void tst_QRingBuffer::free()
     ringBuffer.append(QByteArray("01234", 5));
 
     ringBuffer.free(1);
-    QCOMPARE(ringBuffer.size(), Q_INT64_C(4095 + 2048 + 5));
+    QCOMPARE(ringBuffer.size(), Q_INT64_C(4095) + 2048 + 5);
     ringBuffer.free(4096);
-    QCOMPARE(ringBuffer.size(), Q_INT64_C(2047 + 5));
+    QCOMPARE(ringBuffer.size(), Q_INT64_C(2047) + 5);
     ringBuffer.free(48);
     ringBuffer.free(2000);
     QCOMPARE(ringBuffer.size(), Q_INT64_C(4));
@@ -268,9 +268,9 @@ void tst_QRingBuffer::chop()
     ringBuffer.reserve(4096);
 
     ringBuffer.chop(1);
-    QCOMPARE(ringBuffer.size(), Q_INT64_C(5 + 2048 + 4095));
+    QCOMPARE(ringBuffer.size(), Q_INT64_C(5) + 2048 + 4095);
     ringBuffer.chop(4096);
-    QCOMPARE(ringBuffer.size(), Q_INT64_C(5 + 2047));
+    QCOMPARE(ringBuffer.size(), Q_INT64_C(5) + 2047);
     ringBuffer.chop(48);
     ringBuffer.chop(2000);
     QCOMPARE(ringBuffer.size(), Q_INT64_C(4));