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

Conflicts:
	configure
	qmake/Makefile.unix.macos
	qmake/Makefile.unix.win32
	qmake/generators/win32/msvc_vcproj.cpp
	src/3rdparty/pcre/qt_attribution.json
	src/corelib/io/qsettings.cpp
	src/corelib/kernel/qdeadlinetimer.cpp
	src/platformsupport/kmsconvenience/qkmsdevice.cpp
	src/platformsupport/kmsconvenience/qkmsdevice_p.h
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
	tests/manual/qstorageinfo/printvolumes.cpp
	tools/configure/configureapp.cpp

Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e

5 files changed, 19 insertions, 16 deletions

diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 8cc06a77ba..74bffef4f4 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -698,7 +698,7 @@ void tst_QLocalSocket::simpleCommandProtocol2()
 
     QObject::connect(localSocketRead, &QLocalSocket::readyRead, [&] {
         forever {
-            if (localSocketRead->bytesAvailable() < sizeof(qint64))
+            if (localSocketRead->bytesAvailable() < qint64(sizeof(qint64)))
                 return;
 
             if (blockSize == 0) {
diff --git a/tests/auto/network/socket/qsctpsocket/tst_qsctpsocket.cpp b/tests/auto/network/socket/qsctpsocket/tst_qsctpsocket.cpp
index fc976fbd0d..cf15e60531 100644
--- a/tests/auto/network/socket/qsctpsocket/tst_qsctpsocket.cpp
+++ b/tests/auto/network/socket/qsctpsocket/tst_qsctpsocket.cpp
@@ -112,7 +112,7 @@ void tst_QSctpSocket::constructing()
     QVERIFY(!socket.isOpen());
     QVERIFY(!socket.isValid());
     QCOMPARE(socket.socketType(), QAbstractSocket::SctpSocket);
-    QCOMPARE(socket.maxChannelCount(), 0);
+    QCOMPARE(socket.maximumChannelCount(), 0);
     QCOMPARE(socket.readChannelCount(), 0);
     QCOMPARE(socket.writeChannelCount(), 0);
 
@@ -202,7 +202,7 @@ void tst_QSctpSocket::setSocketDescriptor()
 {
     QSctpServer server;
 
-    server.setMaxChannelCount(16);
+    server.setMaximumChannelCount(16);
     QVERIFY(server.listen());
 
     SOCKET sock = ::socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP);
@@ -218,8 +218,8 @@ void tst_QSctpSocket::setSocketDescriptor()
     QVERIFY(socket.waitForConnected(3000));
     QVERIFY(server.waitForNewConnection(3000));
 
-    QCOMPARE(socket.readChannelCount(), server.maxChannelCount());
-    QVERIFY(socket.writeChannelCount() <= server.maxChannelCount());
+    QCOMPARE(socket.readChannelCount(), server.maximumChannelCount());
+    QVERIFY(socket.writeChannelCount() <= server.maximumChannelCount());
 
     QSctpSocket *acceptedSocket = server.nextPendingDatagramConnection();
     QVERIFY(acceptedSocket);
@@ -338,11 +338,11 @@ void tst_QSctpSocket::loop()
 
     QSctpServer server;
 
-    server.setMaxChannelCount(10);
+    server.setMaximumChannelCount(10);
     QVERIFY(server.listen());
 
     QSctpSocket peter;
-    peter.setMaxChannelCount(10);
+    peter.setMaximumChannelCount(10);
     peter.connectToHost(QHostAddress::LocalHost, server.serverPort());
     QVERIFY(peter.waitForConnected(3000));
 
@@ -389,11 +389,11 @@ void tst_QSctpSocket::loopInTCPMode()
 
     QSctpServer server;
 
-    server.setMaxChannelCount(-1);
+    server.setMaximumChannelCount(-1);
     QVERIFY(server.listen());
 
     QSctpSocket peter;
-    peter.setMaxChannelCount(-1);
+    peter.setMaximumChannelCount(-1);
     peter.connectToHost(QHostAddress::LocalHost, server.serverPort());
     QVERIFY(peter.waitForConnected(3000));
     QVERIFY(server.waitForNewConnection(3000));
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 5a0baf73b5..4bbd0662e4 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -929,15 +929,16 @@ void tst_QTcpServer::linkLocal()
 
     //each server should have two connections
     foreach (QTcpServer* server, servers) {
-        QTcpSocket* remote;
         //qDebug() << "checking for connections" << server->serverAddress() << ":" << server->serverPort();
         QVERIFY(server->waitForNewConnection(5000));
-        QVERIFY(remote = server->nextPendingConnection());
+        QTcpSocket* remote = server->nextPendingConnection();
+        QVERIFY(remote != nullptr);
         remote->close();
         delete remote;
         if (!server->hasPendingConnections())
             QVERIFY(server->waitForNewConnection(5000));
-        QVERIFY(remote = server->nextPendingConnection());
+        remote = server->nextPendingConnection();
+        QVERIFY(remote != nullptr);
         remote->close();
         delete remote;
         QVERIFY(!server->hasPendingConnections());
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
index 407d244f15..ed61db1a13 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
@@ -47,7 +47,8 @@ void My4Socket::read(void)
 {
     QDataStream in(this);
 
-    quint32 num, reply;
+    quint32 num = 0;
+    quint32 reply = 0;
 
     while (bytesAvailable()) {
         in >> num;
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index fb6b0c6e32..9fd5620cec 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -603,7 +603,7 @@ void tst_QTcpSocket::bind()
         if (port)
             QCOMPARE(int(boundPort), port);
         fd = socket->socketDescriptor();
-        QVERIFY(fd != INVALID_SOCKET);
+        QVERIFY(fd != qintptr(INVALID_SOCKET));
     } else {
         QVERIFY(!socket->bind(addr, port));
         QCOMPARE(socket->localPort(), quint16(0));
@@ -667,7 +667,7 @@ void tst_QTcpSocket::bindThenResolveHost()
     QCOMPARE(socket->state(), QAbstractSocket::BoundState);
     quint16 boundPort = socket->localPort();
     qintptr fd = socket->socketDescriptor();
-    QVERIFY(fd != INVALID_SOCKET);
+    QVERIFY(fd != quint16(INVALID_SOCKET));
 
     dummySocket.close();
 
@@ -2251,7 +2251,8 @@ void tst_QTcpSocket::abortiveClose()
     enterLoop(10);
     QVERIFY(server.hasPendingConnections());
 
-    QVERIFY(tmpSocket = server.nextPendingConnection());
+    tmpSocket = server.nextPendingConnection();
+    QVERIFY(tmpSocket != nullptr);
 
     qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
     QSignalSpy readyReadSpy(clientSocket, SIGNAL(readyRead()));