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, 10 insertions, 10 deletions

diff --git a/src/widgets/itemviews/qcolumnview.cpp b/src/widgets/itemviews/qcolumnview.cpp
index 26173b5e92..6c7c914bc0 100644
--- a/src/widgets/itemviews/qcolumnview.cpp
+++ b/src/widgets/itemviews/qcolumnview.cpp
@@ -412,9 +412,9 @@ void QColumnViewPrivate::updateScrollbars()
     // find the total horizontal length of the laid out columns
     int horizontalLength = 0;
     if (!columns.isEmpty()) {
-        horizontalLength = (columns.last()->x() + columns.last()->width()) - columns.first()->x();
+        horizontalLength = (columns.constLast()->x() + columns.constLast()->width()) - columns.constFirst()->x();
         if (horizontalLength <= 0) // reverse mode
-            horizontalLength = (columns.first()->x() + columns.first()->width()) - columns.last()->x();
+            horizontalLength = (columns.constFirst()->x() + columns.constFirst()->width()) - columns.constLast()->x();
     }
 
     QSize viewportSize = viewport->size();
@@ -629,7 +629,7 @@ void QColumnViewPrivate::closeColumns(const QModelIndex &parent, bool build)
     while (!dirsToAppend.isEmpty()) {
         QAbstractItemView *newView = createColumn(dirsToAppend.takeLast(), true);
         if (!dirsToAppend.isEmpty())
-            newView->setCurrentIndex(dirsToAppend.last());
+            newView->setCurrentIndex(dirsToAppend.constLast());
     }
 
     if (build && !alreadyExists)
@@ -713,8 +713,8 @@ QAbstractItemView *QColumnViewPrivate::createColumn(const QModelIndex &index, bo
         columnSizes.resize(qMax(columnSizes.count(), columns.count() + 1));
         columnSizes[columns.count()] = initialWidth;
     }
-    if (!columns.isEmpty() && columns.last()->isHidden())
-        columns.last()->setVisible(true);
+    if (!columns.isEmpty() && columns.constLast()->isHidden())
+        columns.constLast()->setVisible(true);
 
     columns.append(view);
     doLayout();
@@ -835,7 +835,7 @@ void QColumnViewPrivate::setPreviewWidget(QWidget *widget)
 {
     Q_Q(QColumnView);
     if (previewColumn) {
-        if (!columns.isEmpty() && columns.last() == previewColumn)
+        if (!columns.isEmpty() && columns.constLast() == previewColumn)
             columns.removeLast();
         previewColumn->deleteLater();
     }
@@ -1003,11 +1003,11 @@ void QColumnViewPrivate::_q_changeCurrentColumn()
             parentColumn->setCurrentIndex(current.parent());
     }
 
-    if (columns.last()->isHidden()) {
-        columns.last()->setVisible(true);
+    if (columns.constLast()->isHidden()) {
+        columns.constLast()->setVisible(true);
     }
-    if (columns.last()->selectionModel())
-        columns.last()->selectionModel()->clear();
+    if (columns.constLast()->selectionModel())
+        columns.constLast()->selectionModel()->clear();
     updateScrollbars();
 }