Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

8 files changed, 83 insertions, 29 deletions

diff --git a/tests/benchmarks/corelib/io/qfileinfo/main.cpp b/tests/benchmarks/corelib/io/qfileinfo/main.cpp
index 104c01d118..6cc96777a1 100644
--- a/tests/benchmarks/corelib/io/qfileinfo/main.cpp
+++ b/tests/benchmarks/corelib/io/qfileinfo/main.cpp
@@ -81,7 +81,7 @@ void qfileinfo::symLinkTargetPerformanceLNK()
     QString linkTarget;
     QBENCHMARK {
         for(int i=0; i<100; i++)
-            linkTarget = info.readLink();
+            linkTarget = info.symLinkTarget();
     }
     QVERIFY(QFile::remove("link.lnk"));
 }
@@ -104,7 +104,7 @@ void qfileinfo::symLinkTargetPerformanceMounpoint()
     QString linkTarget;
     QBENCHMARK {
         for(int i=0; i<100; i++)
-            linkTarget = info.readLink();
+            linkTarget = info.symLinkTarget();
     }
     QVERIFY(QDir().rmdir(mountpoint));
 }
diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro
index cb8dfdcdcb..a0230e1cb8 100644
--- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro
+++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro
@@ -1,5 +1,5 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 winrt: QMAKE_LFLAGS += /ENTRY:mainCRTStartup
 DESTDIR = ./
diff --git a/tests/benchmarks/corelib/io/qtextstream/qtextstream.pro b/tests/benchmarks/corelib/io/qtextstream/qtextstream.pro
index 758930c139..e8170319f2 100644
--- a/tests/benchmarks/corelib/io/qtextstream/qtextstream.pro
+++ b/tests/benchmarks/corelib/io/qtextstream/qtextstream.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = tst_bench_qtemporaryfile
+TARGET = tst_bench_qtextstream
 
 QT = core testlib
 
diff --git a/tests/benchmarks/corelib/kernel/kernel.pro b/tests/benchmarks/corelib/kernel/kernel.pro
index 02eeeaa254..92f7174419 100644
--- a/tests/benchmarks/corelib/kernel/kernel.pro
+++ b/tests/benchmarks/corelib/kernel/kernel.pro
@@ -5,7 +5,8 @@ SUBDIRS = \
         qmetatype \
         qobject \
         qvariant \
-        qcoreapplication
+        qcoreapplication \
+        qtimer_vs_qmetaobject
 
 !qtHaveModule(widgets): SUBDIRS -= \
     qmetaobject \
diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp
index 66a29780f0..6af5b8d586 100644
--- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp
+++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp
@@ -28,6 +28,7 @@
 
 #include <QtCore>
 #include <QtTest/QtTest>
+#include <QThread>
 
 #define INVOKE_COUNT 10000
 
@@ -35,8 +36,10 @@ class qtimer_vs_qmetaobject : public QObject
 {
     Q_OBJECT
 private slots:
-    void testZeroTimerSingleShot();
-    void testQueuedInvokeMethod();
+    void bench();
+    void bench_data();
+    void benchBackgroundThread();
+    void benchBackgroundThread_data() { bench_data(); }
 };
 
 class InvokeCounter : public QObject {
@@ -47,36 +50,89 @@ public slots:
     void invokeSlot() {
         count++;
         if (count == INVOKE_COUNT)
-            QTestEventLoop::instance().exitLoop();
+            emit allInvoked();
     }
+signals:
+    void allInvoked();
 protected:
     int count;
 };
 
-void qtimer_vs_qmetaobject::testZeroTimerSingleShot()
+void qtimer_vs_qmetaobject::bench()
 {
+    QFETCH(int, type);
+
+    std::function<void(InvokeCounter*)> invoke;
+    if (type == 0) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QTimer::singleShot(0, invokeCounter, SLOT(invokeSlot()));
+        };
+    } else if (type == 1) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QTimer::singleShot(0, invokeCounter, &InvokeCounter::invokeSlot);
+        };
+    } else if (type == 2) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QTimer::singleShot(0, invokeCounter, [invokeCounter]() {
+                invokeCounter->invokeSlot();
+            });
+        };
+    } else if (type == 3) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QTimer::singleShot(0, [invokeCounter]() {
+                invokeCounter->invokeSlot();
+            });
+        };
+    } else if (type == 4) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QMetaObject::invokeMethod(invokeCounter, "invokeSlot", Qt::QueuedConnection);
+        };
+    } else if (type == 5) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QMetaObject::invokeMethod(invokeCounter, &InvokeCounter::invokeSlot, Qt::QueuedConnection);
+        };
+    } else if (type == 6) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QMetaObject::invokeMethod(invokeCounter, [invokeCounter]() {
+                invokeCounter->invokeSlot();
+            }, Qt::QueuedConnection);
+        };
+    } else {
+        QFAIL("unhandled data tag");
+    }
+
     QBENCHMARK {
         InvokeCounter invokeCounter;
+        QSignalSpy spy(&invokeCounter, &InvokeCounter::allInvoked);
         for(int i = 0; i < INVOKE_COUNT; ++i) {
-            QTimer::singleShot(0, &invokeCounter, SLOT(invokeSlot()));
+            invoke(&invokeCounter);
         }
-        QTestEventLoop::instance().enterLoop(10);
-        QVERIFY(!QTestEventLoop::instance().timeout());
+        QVERIFY(spy.wait(10000));
     }
 }
 
-void qtimer_vs_qmetaobject::testQueuedInvokeMethod()
+void qtimer_vs_qmetaobject::bench_data()
 {
-    QBENCHMARK {
-        InvokeCounter invokeCounter;
-        for(int i = 0; i < INVOKE_COUNT; ++i) {
-            QMetaObject::invokeMethod(&invokeCounter, "invokeSlot", Qt::QueuedConnection);
-        }
-        QTestEventLoop::instance().enterLoop(10);
-        QVERIFY(!QTestEventLoop::instance().timeout());
-    }
+    QTest::addColumn<int>("type");
+    QTest::addRow("singleShot_slot") << 0;
+    QTest::addRow("singleShot_pmf") << 1;
+    QTest::addRow("singleShot_functor") << 2;
+    QTest::addRow("singleShot_functor_noctx") << 3;
+    QTest::addRow("invokeMethod_string") << 4;
+    QTest::addRow("invokeMethod_pmf") << 5;
+    QTest::addRow("invokeMethod_functor") << 6;
 }
 
+void qtimer_vs_qmetaobject::benchBackgroundThread()
+{
+#if !QT_CONFIG(cxx11_future)
+    QSKIP("This test requires QThread::create");
+#else
+    QScopedPointer<QThread> thread(QThread::create([this]() { bench(); }));
+    thread->start();
+    QVERIFY(thread->wait());
+#endif
+}
 
 QTEST_MAIN(qtimer_vs_qmetaobject)
 
diff --git a/tests/benchmarks/corelib/tools/qcryptographichash/qcryptographichash.pro b/tests/benchmarks/corelib/tools/qcryptographichash/qcryptographichash.pro
index 9c55de8b47..cf9d640f7e 100644
--- a/tests/benchmarks/corelib/tools/qcryptographichash/qcryptographichash.pro
+++ b/tests/benchmarks/corelib/tools/qcryptographichash/qcryptographichash.pro
@@ -1,5 +1,5 @@
 TARGET = tst_bench_qcryptographichash
-CONFIG -= debug app_bundle
-CONFIG += release console
+CONFIG -= debug
+CONFIG += release cmdline
 QT = core testlib
 SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/tools/qdatetime/main.cpp b/tests/benchmarks/corelib/tools/qdatetime/main.cpp
index 2c1e3d97ae..b693400376 100644
--- a/tests/benchmarks/corelib/tools/qdatetime/main.cpp
+++ b/tests/benchmarks/corelib/tools/qdatetime/main.cpp
@@ -35,10 +35,7 @@ class tst_QDateTime : public QObject
 {
     Q_OBJECT
 
-    enum
-#if defined(Q_COMPILER_CLASS_ENUM) || (defined(Q_CC_MSVC) && _MSC_VER >= 1700)
-        : qint64
-#endif
+    enum : qint64
     {
         SECS_PER_DAY = 86400,
         MSECS_PER_DAY = 86400000,
diff --git a/tests/benchmarks/corelib/tools/qmap/qmap.pro b/tests/benchmarks/corelib/tools/qmap/qmap.pro
index 6a0c8d62bd..6c9bf5e8d6 100644
--- a/tests/benchmarks/corelib/tools/qmap/qmap.pro
+++ b/tests/benchmarks/corelib/tools/qmap/qmap.pro
@@ -1,4 +1,4 @@
-TARGET = tst_qmap
+TARGET = tst_bench_qmap
 QT = core testlib
 INCLUDEPATH += .
 SOURCES += main.cpp