Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	qmake/library/qmakebuiltins.cpp
	qmake/library/qmakeevaluator.cpp
	qmake/library/qmakeevaluator.h
	qmake/project.h
QMakeEvaluator:
* evaluateConditional(): one side changed return type, the other
  changed a parameter type.
* split_value_list(): one side changed a parameter adjacent to where ...
* expandVariableReferences(): ... the other killed one overload and
  changed the survivor

	src/corelib/io/qlockfile_unix.cpp
One side changed a #if condition, the other moved NETBSD's part of
what it controlled.

	src/corelib/tools/qdatetime.cpp
One side fixed a reachable Q_UNREACHABLE in toMSecsSinceEpoch(), the
other moved it from the private class to the public one, in the midst
of the "short date-time" optimization, which confused diff entirely.
One side changed a QStringLiteral to QLatin1String, the other rewrote
adjoining code.

	src/network/kernel/qauthenticator.cpp
Both rewrote a line, equivalently; kept the dev version.

	src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
	src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
One side changed #if-ery that the other removed.

	tools/configure/configureapp.cpp
One side added a check to -target parsing; the other killed -target.

	tests/auto/testlib/selftests/expected_cmptest.lightxml
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt
	tests/auto/testlib/selftests/expected_cmptest.xml
	tests/auto/testlib/selftests/expected_cmptest.xunitxml
Regenerated using generate_expected_output.py
I note that quite a few other expected_* come out changed, now.

There was no git-conflict in
	src/widgets/kernel/qformlayout.cpp
but it didn't compile; one side removed some unused methods; the other
found uses for one of them.  Put FixedColumnMatrix<>::removeRow(int)
back for its new user.

Change-Id: I8cc2a71add48c0a848e13cfc47b5a7754e8ca584

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
index ccc31cf2d3..97eb19599b 100644
--- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
+++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
@@ -142,6 +142,8 @@ private slots:
     void compareQPixmaps_data();
     void compareQImages();
     void compareQImages_data();
+    void compareQRegion_data();
+    void compareQRegion();
 #endif
     void verify();
     void verify2();
@@ -429,6 +431,29 @@ void tst_Cmptest::compareQImages()
 
     QCOMPARE(opA, opB);
 }
+
+void tst_Cmptest::compareQRegion_data()
+{
+    QTest::addColumn<QRegion>("rA");
+    QTest::addColumn<QRegion>("rB");
+    const QRect rect1(QPoint(10, 10), QSize(200, 50));
+    const QRegion region1(rect1);
+    QRegion listRegion2;
+    const QVector<QRect> list2 = QVector<QRect>() << QRect(QPoint(100, 200), QSize(50, 200)) << rect1;
+    listRegion2.setRects(list2.constData(), list2.size());
+    QTest::newRow("equal-empty") << QRegion() << QRegion();
+    QTest::newRow("1-empty") << region1 << QRegion();
+    QTest::newRow("equal") << region1 << region1;
+    QTest::newRow("different lists") << region1 << listRegion2;
+}
+
+void tst_Cmptest::compareQRegion()
+{
+    QFETCH(QRegion, rA);
+    QFETCH(QRegion, rB);
+
+    QCOMPARE(rA, rB);
+}
 #endif // QT_GUI_LIB
 
 static int opaqueFunc()