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

 Conflicts:
	src/widgets/widgets/qabstractbutton.cpp
	src/widgets/widgets/qbuttongroup.cpp
	src/widgets/widgets/qbuttongroup.h
	src/widgets/widgets/qsplashscreen.cpp
	tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
        tests/benchmarks/opengl/main.cpp

  Needed update:
	src/plugins/platforms/cocoa/CMakeLists.txt

Change-Id: I7be4baebb63844ec2b3e0de859ca9de1bc730bb5

3 files changed, 19 insertions, 16 deletions

diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
index 1f3f38eaaf..7f0f0190ec 100644
--- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
+++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -32,6 +32,7 @@
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
 #include <QtCore/QTemporaryFile>
+#include <QtCore/QElapsedTimer>
 #include <QtCore/QFile>
 
 class qfile_vs_qnetworkaccessmanager : public QObject
@@ -88,7 +89,7 @@ void qfile_vs_qnetworkaccessmanager::qnamFileRead_iteration(QNetworkAccessManage
 void qfile_vs_qnetworkaccessmanager::qnamFileRead()
 {
     QNetworkAccessManager manager;
-    QTime t;
+    QElapsedTimer t;
     QNetworkRequest request(QUrl::fromLocalFile(testFile.fileName()));
 
     // do 3 dry runs for cache warmup
@@ -121,7 +122,7 @@ void qfile_vs_qnetworkaccessmanager::qnamImmediateFileRead_iteration(QNetworkAcc
 void qfile_vs_qnetworkaccessmanager::qnamImmediateFileRead()
 {
     QNetworkAccessManager manager;
-    QTime t;
+    QElapsedTimer t;
     QNetworkRequest request(QUrl::fromLocalFile(testFile.fileName()));
 
     // do 3 dry runs for cache warmup
@@ -151,7 +152,7 @@ void qfile_vs_qnetworkaccessmanager::qfileFileRead_iteration()
 
 void qfile_vs_qnetworkaccessmanager::qfileFileRead()
 {
-    QTime t;
+    QElapsedTimer t;
 
     // do 3 dry runs for cache warmup
     qfileFileRead_iteration();
diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 95ee094f00..559ed82834 100644
--- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -31,6 +31,7 @@
 #include <qtest.h>
 #include <QtTest/QtTest>
 #include <QtCore/qrandom.h>
+#include <QtCore/QElapsedTimer>
 #include <QtNetwork/qnetworkreply.h>
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
@@ -93,7 +94,7 @@ protected:
         QEventLoop eventLoop;
         QTimer::singleShot(timeout, &eventLoop, SLOT(quit()));
 
-        QTime timer;
+        QElapsedTimer timer;
         timer.start();
         eventLoop.exec();
         disconnect(client, SIGNAL(bytesWritten(qint64)), this, 0);
@@ -187,7 +188,7 @@ protected:
         DataReader reader(client, false);
         QObject::connect(client, SIGNAL(disconnected()), &eventLoop, SLOT(quit()));
 
-        QTime timer;
+        QElapsedTimer timer;
         timer.start();
         eventLoop.exec();
         qint64 elapsed = timer.elapsed();
@@ -280,7 +281,7 @@ protected:
         DataReader reader(client, false);
         QObject::connect(client, SIGNAL(disconnected()), &eventLoop, SLOT(quit()));
 
-        QTime timer;
+        QElapsedTimer timer;
         timer.start();
         eventLoop.exec();
         qint64 elapsed = timer.elapsed();
@@ -611,7 +612,7 @@ void tst_qnetworkreply::downloadPerformance()
     QNetworkReplyPtr reply(manager.get(request));
     DataReader reader(reply, false);
 
-    QTime loopTime;
+    QElapsedTimer loopTime;
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
     loopTime.start();
     QTestEventLoop::instance().enterLoop(40);
@@ -654,7 +655,7 @@ void tst_qnetworkreply::httpUploadPerformance()
 
       connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
 
-      QTime time;
+      QElapsedTimer time;
       generator.start();
       time.start();
       QTestEventLoop::instance().enterLoop(40);
@@ -682,7 +683,7 @@ void tst_qnetworkreply::performanceControlRate()
     sink.connectToHost("127.0.0.1", sender.serverPort());
     DataReader reader(&sink, false);
 
-    QTime loopTime;
+    QElapsedTimer loopTime;
     connect(&sink, SIGNAL(disconnected()), &QTestEventLoop::instance(), SLOT(exitLoop()));
     loopTime.start();
     QTestEventLoop::instance().enterLoop(40);
@@ -720,7 +721,7 @@ void tst_qnetworkreply::httpDownloadPerformance()
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection);
     HttpDownloadPerformanceClient client(reply.data());
 
-    QTime time;
+    QElapsedTimer time;
     time.start();
     QTestEventLoop::instance().enterLoop(40);
     QCOMPARE(reply->error(), QNetworkReply::NoError);
diff --git a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
index a9f8634129..f35e5cd3db 100644
--- a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -27,6 +27,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
+#include <QtCore/QElapsedTimer>
 #include <qglobal.h>
 #include <qcoreapplication.h>
 #include <qtcpsocket.h>
@@ -129,7 +130,7 @@ void tst_QTcpServer::ipv4LoopbackPerformanceTest()
     QVERIFY(clientB);
 
     QByteArray buffer(16384, '@');
-    QTime stopWatch;
+    QElapsedTimer stopWatch;
     stopWatch.start();
     qlonglong totalWritten = 0;
     while (stopWatch.elapsed() < 5000) {
@@ -180,7 +181,7 @@ void tst_QTcpServer::ipv6LoopbackPerformanceTest()
         QVERIFY(clientB);
 
         QByteArray buffer(16384, '@');
-        QTime stopWatch;
+        QElapsedTimer stopWatch;
         stopWatch.start();
         qlonglong totalWritten = 0;
         while (stopWatch.elapsed() < 5000) {
@@ -230,7 +231,7 @@ void tst_QTcpServer::ipv4PerformanceTest()
     QVERIFY(clientB);
 
     QByteArray buffer(16384, '@');
-    QTime stopWatch;
+    QElapsedTimer stopWatch;
     stopWatch.start();
     qlonglong totalWritten = 0;
     while (stopWatch.elapsed() < 5000) {