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, 6 insertions, 4 deletions

diff --git a/tests/manual/diaglib/diaglib.pri b/tests/manual/diaglib/diaglib.pri
index 9bcf0317a6..e3e7c3757c 100644
--- a/tests/manual/diaglib/diaglib.pri
+++ b/tests/manual/diaglib/diaglib.pri
@@ -2,15 +2,13 @@ INCLUDEPATH += $$PWD
 SOURCES += \
     $$PWD/textdump.cpp \
     $$PWD/eventfilter.cpp \
-    $$PWD/qwindowdump.cpp \
-    $$PWD/debugproxystyle.cpp
+    $$PWD/qwindowdump.cpp
 
 HEADERS += \
     $$PWD/textdump.h \
     $$PWD/eventfilter.h \
     $$PWD/qwindowdump.h \
-    $$PWD/nativewindowdump.h \
-    $$PWD/debugproxystyle.h
+    $$PWD/nativewindowdump.h
 
 win32 {
     SOURCES += $$PWD/nativewindowdump_win.cpp
@@ -24,19 +22,23 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     contains(QT, widgets) {
         HEADERS += \
             $$PWD/qwidgetdump.h \
+            $$PWD/debugproxystyle.h \
             $$PWD/logwidget.h
 
         SOURCES += \
             $$PWD/qwidgetdump.cpp \
+            $$PWD/debugproxystyle.cpp \
             $$PWD/logwidget.cpp
     }
 } else {
     HEADERS += \
         $$PWD/qwidgetdump.h \
+        $$PWD/debugproxystyle.h \
         $$PWD/logwidget.h
 
     SOURCES += \
         $$PWD/qwidgetdump.cpp \
+        $$PWD/debugproxystyle.cpp \
         $$PWD/logwidget.cpp
 }