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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

11 files changed, 51 insertions, 50 deletions

diff --git a/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
index 1d47d98657..8f8e8300a1 100644
--- a/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
+++ b/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
@@ -30,7 +30,7 @@
 #include <QtTest/QtTest>
 #include <QtCore/private/qmemory_p.h>
 #include <mutex>
-#if QT_HAS_INCLUDE(<shared_mutex>)
+#if __has_include(<shared_mutex>)
 #if __cplusplus > 201103L
 #include <shared_mutex>
 #endif
diff --git a/tests/benchmarks/corelib/tools/qmap/main.cpp b/tests/benchmarks/corelib/tools/qmap/main.cpp
index ce415212e4..50cc853df6 100644
--- a/tests/benchmarks/corelib/tools/qmap/main.cpp
+++ b/tests/benchmarks/corelib/tools/qmap/main.cpp
@@ -59,6 +59,8 @@ private slots:
 
     void insertion_string_int2();
     void insertion_string_int2_hint();
+
+    void insertMap();
 };
 
 
@@ -269,6 +271,19 @@ void tst_QMap::insertion_string_int2_hint()
     }
 }
 
+void tst_QMap::insertMap()
+{
+    QMap<int, int> map;
+    for (int i = 0; i < 100000; ++i)
+        map.insert(i * 4, 0);
+    QMap<int, int> map2;
+    for (int i = 0; i < 50000; ++i)
+        map2.insert(i * 7, 0);
+    QBENCHMARK_ONCE {
+        map.insert(map2);
+    }
+}
+
 QTEST_MAIN(tst_QMap)
 
 #include "main.moc"
diff --git a/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp b/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp
index d26ac016b9..bd0889bf4a 100644
--- a/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp
+++ b/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp
@@ -305,17 +305,17 @@ void tst_LanceBench::runTestSuite(GraphicsEngine engine, QImage::Format format,
 
 void tst_LanceBench::paint(QPaintDevice *device, GraphicsEngine engine, QImage::Format format, const QStringList &script, const QString &filePath)
 {
+    PaintCommands pcmd(script, 800, 800, format);
+    switch (engine) {
+    case OpenGL:
+        pcmd.setType(OpenGLBufferType); // version/profile is communicated through the context's format()
+        break;
+    case Raster:
+        pcmd.setType(ImageType);
+        break;
+    }
+    pcmd.setFilePath(filePath);
     QBENCHMARK {
-        PaintCommands pcmd(script, 800, 800, format);
-        switch (engine) {
-        case OpenGL:
-            pcmd.setType(OpenGLBufferType); // version/profile is communicated through the context's format()
-            break;
-        case Raster:
-            pcmd.setType(ImageType);
-            break;
-        }
-        pcmd.setFilePath(filePath);
         QPainter p(device);
         pcmd.setPainter(&p);
         pcmd.runCommands();
diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 6dd7eaee6b..1a8c8de0c8 100644
--- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -479,7 +479,8 @@ private:
 
 void tst_qnetworkreply::initTestCase()
 {
-    QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
+    if (!QtNetworkSettings::verifyTestNetworkSettings())
+        QSKIP("No network test server available");
 }
 
 void tst_qnetworkreply::httpLatency()
@@ -536,7 +537,7 @@ void tst_qnetworkreply::echoPerformance()
         connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection);
         QTestEventLoop::instance().enterLoop(5);
         QVERIFY(!QTestEventLoop::instance().timeout());
-        QVERIFY(reply->error() == QNetworkReply::NoError);
+        QVERIFY(reply->networkError() == QNetworkReply::NoError);
         delete reply;
     }
 }
@@ -561,7 +562,7 @@ void tst_qnetworkreply::preConnectEncrypted()
     QPair<QNetworkReply *, qint64> normalResult = runGetRequest(&manager, request);
     QNetworkReply *normalReply = normalResult.first;
     QVERIFY(!QTestEventLoop::instance().timeout());
-    QVERIFY(normalReply->error() == QNetworkReply::NoError);
+    QVERIFY(normalReply->networkError() == QNetworkReply::NoError);
     qint64 normalElapsed = normalResult.second;
 
     // clear all caches again
@@ -580,7 +581,7 @@ void tst_qnetworkreply::preConnectEncrypted()
     QPair<QNetworkReply *, qint64> preConnectResult = runGetRequest(&manager, request);
     QNetworkReply *preConnectReply = normalResult.first;
     QVERIFY(!QTestEventLoop::instance().timeout());
-    QVERIFY(preConnectReply->error() == QNetworkReply::NoError);
+    QVERIFY(preConnectReply->networkError() == QNetworkReply::NoError);
     qint64 preConnectElapsed = preConnectResult.second;
     qDebug() << request.url().toString() << "full request:" << normalElapsed
              << "ms, pre-connect request:" << preConnectElapsed << "ms, difference:"
@@ -635,7 +636,7 @@ void tst_qnetworkreply::uploadPerformance()
       QTimer::singleShot(5000, &generator, SLOT(stop()));
 
       QTestEventLoop::instance().enterLoop(30);
-      QCOMPARE(reply->error(), QNetworkReply::NoError);
+      QCOMPARE(reply->networkError(), QNetworkReply::NoError);
       QVERIFY(!QTestEventLoop::instance().timeout());
 }
 
@@ -661,7 +662,7 @@ void tst_qnetworkreply::httpUploadPerformance()
       reader.exit();
       reader.wait();
       QVERIFY(reply->isFinished());
-      QCOMPARE(reply->error(), QNetworkReply::NoError);
+      QCOMPARE(reply->networkError(), QNetworkReply::NoError);
       QVERIFY(!QTestEventLoop::instance().timeout());
 
       qDebug() << "tst_QNetworkReply::httpUploadPerformance" << elapsed << "msec, "
@@ -722,7 +723,7 @@ void tst_qnetworkreply::httpDownloadPerformance()
     QTime time;
     time.start();
     QTestEventLoop::instance().enterLoop(40);
-    QCOMPARE(reply->error(), QNetworkReply::NoError);
+    QCOMPARE(reply->networkError(), QNetworkReply::NoError);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     qint64 elapsed = time.elapsed();
@@ -804,7 +805,7 @@ void tst_qnetworkreply::httpDownloadPerformanceDownloadBuffer()
 
     QBENCHMARK_ONCE {
         QTestEventLoop::instance().enterLoop(40);
-        QCOMPARE(reply->error(), QNetworkReply::NoError);
+        QCOMPARE(reply->networkError(), QNetworkReply::NoError);
         QVERIFY(reply->isFinished());
         QVERIFY(!QTestEventLoop::instance().timeout());
     }
@@ -839,7 +840,7 @@ public slots:
         }
         QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
         if (reply) {
-            QVERIFY(reply->error() == QNetworkReply::NoError);
+            QVERIFY(reply->networkError() == QNetworkReply::NoError);
             qDebug() << "time =" << timeOneRequest.elapsed() << "ms";
             timeList.append(timeOneRequest.elapsed());
         }
@@ -894,7 +895,7 @@ void tst_qnetworkreply::runHttpsUploadRequest(const QByteArray &data, const QNet
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
     QTestEventLoop::instance().enterLoop(15);
     QVERIFY(!QTestEventLoop::instance().timeout());
-    QCOMPARE(reply->error(), QNetworkReply::NoError);
+    QCOMPARE(reply->networkError(), QNetworkReply::NoError);
     reply->deleteLater();
 }
 
@@ -934,7 +935,7 @@ void tst_qnetworkreply::preConnect()
     QPair<QNetworkReply *, qint64> normalResult = runGetRequest(&manager, request);
     QNetworkReply *normalReply = normalResult.first;
     QVERIFY(!QTestEventLoop::instance().timeout());
-    QVERIFY(normalReply->error() == QNetworkReply::NoError);
+    QVERIFY(normalReply->networkError() == QNetworkReply::NoError);
     qint64 normalElapsed = normalResult.second;
 
     // clear all caches again
@@ -954,7 +955,7 @@ void tst_qnetworkreply::preConnect()
     QPair<QNetworkReply *, qint64> preConnectResult = runGetRequest(&manager, request);
     QNetworkReply *preConnectReply = normalResult.first;
     QVERIFY(!QTestEventLoop::instance().timeout());
-    QVERIFY(preConnectReply->error() == QNetworkReply::NoError);
+    QVERIFY(preConnectReply->networkError() == QNetworkReply::NoError);
     qint64 preConnectElapsed = preConnectResult.second;
     qDebug() << request.url().toString() << "full request:" << normalElapsed
              << "ms, pre-connect request:" << preConnectElapsed << "ms, difference:"
diff --git a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
index 109126790b..a9f8634129 100644
--- a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -81,7 +81,8 @@ void tst_QTcpServer::initTestCase_data()
 
 void tst_QTcpServer::initTestCase()
 {
-    QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
+    if (!QtNetworkSettings::verifyTestNetworkSettings())
+        QSKIP("No network test server available");
 }
 
 void tst_QTcpServer::init()
diff --git a/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp
index c01c673604..afd0c720a2 100644
--- a/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -63,7 +63,8 @@ tst_QSslSocket::~tst_QSslSocket()
 
 void tst_QSslSocket::initTestCase()
 {
-    QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
+    if (!QtNetworkSettings::verifyTestNetworkSettings())
+        QSKIP("No network test server available");
 }
 
 void tst_QSslSocket::init()
diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h
index 7e247b63a4..1212703ddb 100644
--- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h
+++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h
@@ -37,7 +37,7 @@ class GvbWidget : public QGraphicsWidget
 
 public:
 
-    GvbWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0);
+    GvbWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = { });
     ~GvbWidget();
     virtual void keyPressEvent(QKeyEvent *event);
 };
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
index caf5455a80..bd7899e671 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -47,7 +47,7 @@ private slots:
 class RectWidget : public QGraphicsWidget
 {
 public:
-    RectWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0) : QGraphicsWidget(parent, wFlags), setGeometryCalls(0) {}
+    RectWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = { }) : QGraphicsWidget(parent, wFlags), setGeometryCalls(0) {}
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
     {
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp
index dfa08b6869..1eaa5f6578 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp
@@ -56,13 +56,6 @@ void ChipTester::setAntialias(bool enabled)
     setRenderHint(QPainter::Antialiasing, enabled);
 }
 
-void ChipTester::setOpenGL(bool enabled)
-{
-#ifndef QT_NO_OPENGL
-    setViewport(enabled ? new QGLWidget(QGLFormat(QGL::SampleBuffers)) : 0);
-#endif
-}
-
 void ChipTester::setOperation(Operation operation)
 {
     this->operation = operation;
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
index d85686c94e..e4c9197142 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
@@ -51,7 +51,6 @@ public:
     ChipTester(QWidget *parent = 0);
 
     void setAntialias(bool enabled);
-    void setOpenGL(bool enabled);
     void runBenchmark();
     void setOperation(Operation operation);
 
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 9bb5231528..25fc439883 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -382,31 +382,22 @@ void tst_QGraphicsView::mapRectFromScene()
 void tst_QGraphicsView::chipTester_data()
 {
     QTest::addColumn<bool>("antialias");
-    QTest::addColumn<bool>("opengl");
     QTest::addColumn<int>("operation");
-    QTest::newRow("rotate, normal") << false << false << 0;
-    QTest::newRow("rotate, normal, antialias") << true << false << 0;
-    QTest::newRow("rotate, opengl") << false << true << 0;
-    QTest::newRow("rotate, opengl, antialias") << true << true << 0;
-    QTest::newRow("zoom, normal") << false << false << 1;
-    QTest::newRow("zoom, normal, antialias") << true << false << 1;
-    QTest::newRow("zoom, opengl") << false << true << 1;
-    QTest::newRow("zoom, opengl, antialias") << true << true << 1;
-    QTest::newRow("translate, normal") << false << false << 2;
-    QTest::newRow("translate, normal, antialias") << true << false << 2;
-    QTest::newRow("translate, opengl") << false << true << 2;
-    QTest::newRow("translate, opengl, antialias") << true << true << 2;
+    QTest::newRow("rotate") << false << 0;
+    QTest::newRow("rotate, antialias") << true << 0;
+    QTest::newRow("zoom") << false << 1;
+    QTest::newRow("zoom, antialias") << true << 1;
+    QTest::newRow("translate") << false << 2;
+    QTest::newRow("translate, antialias") << true << 2;
 }
 
 void tst_QGraphicsView::chipTester()
 {
     QFETCH(bool, antialias);
-    QFETCH(bool, opengl);
     QFETCH(int, operation);
 
     ChipTester tester;
     tester.setAntialias(antialias);
-    tester.setOpenGL(opengl);
     tester.setOperation(ChipTester::Operation(operation));
     tester.show();
     QVERIFY(QTest::qWaitForWindowExposed(&tester));