Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ib5662d80d5b2f58cf4634c54c054545ba9df807e

15 files changed, 507 insertions, 48 deletions

diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 07a6d5ecaa..6d62fa09d9 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
-SUBDIRS = qml
+SUBDIRS = qml quick
 qtConfig(private_tests) {
     qtConfig(opengl(es1|es2)?):SUBDIRS += particles
 }
diff --git a/tests/benchmarks/qml/animation/tst_animation.cpp b/tests/benchmarks/qml/animation/tst_animation.cpp
index 27622ed013..f377c94f72 100644
--- a/tests/benchmarks/qml/animation/tst_animation.cpp
+++ b/tests/benchmarks/qml/animation/tst_animation.cpp
@@ -125,12 +125,12 @@ void tst_animation::animationelements_data()
 void tst_animation::animationelements()
 {
     QFETCH(QString, type);
-    QQmlType *t = QQmlMetaType::qmlType(type, 2, 0);
-    if (!t || !t->isCreatable())
+    QQmlType t = QQmlMetaType::qmlType(type, 2, 0);
+    if (!t.isValid() || !t.isCreatable())
         QSKIP("Non-creatable type");
 
     QBENCHMARK {
-        QObject *obj = t->create();
+        QObject *obj = t.create();
         delete obj;
     }
 }
diff --git a/tests/benchmarks/qml/creation/tst_creation.cpp b/tests/benchmarks/qml/creation/tst_creation.cpp
index c0907b5dd1..ed2e52f869 100644
--- a/tests/benchmarks/qml/creation/tst_creation.cpp
+++ b/tests/benchmarks/qml/creation/tst_creation.cpp
@@ -196,27 +196,21 @@ void tst_creation::qobject_10tree_cpp()
 
 void tst_creation::qobject_qmltype()
 {
-    QQmlType *t = QQmlMetaType::qmlType("QtQuick/QtObject", 2, 0);
+    QQmlType t = QQmlMetaType::qmlType("QtQuick/QtObject", 2, 0);
 
     QBENCHMARK {
-        QObject *obj = t->create();
+        QObject *obj = t.create();
         delete obj;
     }
 }
 
-struct QQmlGraphics_Derived : public QObject
-{
-    void setParent_noEvent(QObject *parent) {
-        bool sce = d_ptr->sendChildEvents;
-        d_ptr->sendChildEvents = false;
-        setParent(parent);
-        d_ptr->sendChildEvents = sce;
-    }
-};
-
 inline void QQmlGraphics_setParent_noEvent(QObject *object, QObject *parent)
 {
-    static_cast<QQmlGraphics_Derived *>(object)->setParent_noEvent(parent);
+    QObjectPrivate *d_ptr = QObjectPrivate::get(object);
+    bool sce = d_ptr->sendChildEvents;
+    d_ptr->sendChildEvents = false;
+    object->setParent(parent);
+    d_ptr->sendChildEvents = sce;
 }
 
 void tst_creation::itemtree_notree_cpp()
diff --git a/tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml b/tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml
index 0074370b72..b3e57551fe 100644
--- a/tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml
+++ b/tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml b/tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml
index cfc396b20e..6bf0abb830 100644
--- a/tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml
+++ b/tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml b/tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
index 4358df1c5c..bbfb0e3432 100644
--- a/tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
+++ b/tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/tests/benchmarks/qml/holistic/testtypes.h b/tests/benchmarks/qml/holistic/testtypes.h
index a752a8585b..6ff64c645d 100644
--- a/tests/benchmarks/qml/holistic/testtypes.h
+++ b/tests/benchmarks/qml/holistic/testtypes.h
@@ -34,6 +34,7 @@
 #include <QtCore/qpoint.h>
 #include <QtCore/qsize.h>
 #include <QtQml/qqmllist.h>
+#include <QtCore/qrandom.h>
 #include <QtCore/qrect.h>
 #include <QtGui/qmatrix.h>
 #include <QtGui/qcolor.h>
@@ -223,7 +224,7 @@ public:
     {
         QPixmap pv(150, 150);
         pv.fill(Qt::green);
-        int choice = qrand() % 4;
+        int choice = QRandomGenerator::global()->bounded(4);
         switch (choice) {
             case 0: setArbitraryVariant(QVariant(QString(QLatin1String("string variant value")))); break;
             case 1: setArbitraryVariant(QVariant(QColor(110, 120, 130))); break;
@@ -253,7 +254,7 @@ public:
         QVariant retn;
         QPixmap pv(randomFactorOne % 300, randomFactorTwo % 300);
         pv.fill(QColor(randomFactorOne % 256, randomFactorTwo % 256, randomFactorThree % 256));
-        int choice = qrand() % 4;
+        int choice = QRandomGenerator::global()->bounded(4);
         switch (choice) {
             case 0: retn = QVariant(QString(QLatin1String("string variant value"))); break;
             case 1: retn = QVariant(QColor(randomFactorThree % 256, randomFactorTwo % 256, randomFactorOne % 256)); break;
diff --git a/tests/benchmarks/qml/holistic/tst_holistic.cpp b/tests/benchmarks/qml/holistic/tst_holistic.cpp
index 791ae6812b..9186816a16 100644
--- a/tests/benchmarks/qml/holistic/tst_holistic.cpp
+++ b/tests/benchmarks/qml/holistic/tst_holistic.cpp
@@ -107,9 +107,6 @@ private slots:
 
     void typeResolution_data();
     void typeResolution();
-
-private:
-    QQmlEngine engine;
 };
 
 tst_holistic::tst_holistic()
@@ -251,6 +248,8 @@ void tst_holistic::compilation()
     Q_ASSERT(files.size() > 0);
     Q_ASSERT(repetitions > 0);
 
+    QQmlEngine engine;
+
     QBENCHMARK {
         engine.clearComponentCache();
         for (int i = 0; i < repetitions; ++i) {
@@ -272,6 +271,8 @@ void tst_holistic::instantiation()
     Q_ASSERT(files.size() > 0);
     Q_ASSERT(repetitions > 0);
 
+    QQmlEngine engine;
+
     QList<QQmlComponent*> components;
     for (int i = 0; i < files.size(); ++i) {
         QQmlComponent *c = new QQmlComponent(&engine, QUrl::fromLocalFile(files.at(i)));
@@ -306,6 +307,8 @@ void tst_holistic::creation()
     Q_ASSERT(files.size() > 0);
     Q_ASSERT(repetitions > 0);
 
+    QQmlEngine engine;
+
     QBENCHMARK {
         engine.clearComponentCache();
         for (int i = 0; i < repetitions; ++i) {
@@ -369,6 +372,7 @@ void tst_holistic::dynamicity()
     QFETCH(QVariant, writeValueTwo);
     QFETCH(QString, readProperty);
 
+    QQmlEngine engine;
     QQmlComponent c(&engine, file);
     QObject *obj = c.create();
 
@@ -478,6 +482,7 @@ void tst_holistic::cppToJsDirect()
     QFETCH(QString, file);
     QFETCH(QString, methodName);
 
+    QQmlEngine engine;
     QQmlComponent c(&engine, file);
     QObject *obj = c.create();
 
@@ -497,6 +502,7 @@ void tst_holistic::cppToJsIndirect()
     // The benchmark deliberately causes change signals to be emitted (and
     // modifies the scarce resources) so that the properties are updated.
 
+    QQmlEngine engine;
     QQmlComponent c(&engine, QString(SRCDIR + QLatin1String("/data/scopeSwitching/ScarceTwo.qml")));
     QObject *obj = c.create();
 
@@ -560,6 +566,7 @@ void tst_holistic::typeResolution()
     Q_ASSERT(propertyNameTwo.size() == propertyValueTwo.size());
     Q_ASSERT(repetitions > 0);
 
+    QQmlEngine engine;
     QQmlComponent c(&engine, file);
     QObject *obj = c.create();
 
diff --git a/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp b/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp
index d7c54703ad..7db01180be 100644
--- a/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp
+++ b/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp
@@ -35,6 +35,16 @@
 // This benchmark produces performance statistics
 // for the standard set of elements, properties and expressions which
 // are provided in the QtDeclarative library (QtQml and QtQuick).
+//
+// Note that we have hand-rolled our own benchmark harness, rather
+// than directly using QBENCHMARK, in order to avoid contaminating
+// the benchmark results with unwanted initialization or side-effects
+// and allow us to more completely isolate the required specific area
+// (compilation, instantiation, or cached type-data instantiation)
+// that we wish to benchmark.
+
+#define AVERAGE_OVER_N 10
+#define IGNORE_N_OUTLIERS 2
 
 class ModuleApi : public QObject
 {
@@ -197,6 +207,18 @@ void tst_librarymetrics_performance::metrics_data()
     QTest::newRow("062) positioning - binding (with grid) positioning") << testFileUrl("data/bindingwithgridpositioning.qml");
 }
 
+// This method is intended to benchmark the amount of time / cpu cycles
+// required to compile the given QML input.
+// Note that this deliberately does NOT include the time taken to
+// construct the QML engine.
+// Also note that between each iteration, we attempt to clean the
+// engine state (destroying and reconstructing the engine, clearing
+// the QML type registrations, etc) to simulate a cold-start environment.
+//
+// The benchmark result is expected to be dominated by QML parsing,
+// compilation, and optimization paths, and since the compiled component
+// is never instantiated, no construction or binding evaluation should
+// occur.
 void tst_librarymetrics_performance::compilation()
 {
     QFETCH(QUrl, qmlfile);
@@ -211,37 +233,148 @@ void tst_librarymetrics_performance::compilation()
         }
     }
 
-    QBENCHMARK {
+    QList<qint64> nResults;
+
+    // generate AVERAGE_OVER_N results
+    for (int i = 0; i < AVERAGE_OVER_N; ++i) {
         cleanState(&e);
-        QQmlComponent c(e, this);
-        c.loadUrl(qmlfile); // just compile.
+        {
+            QElapsedTimer et;
+            et.start();
+            // BEGIN benchmarked code block
+            QQmlComponent c(e, this);
+            c.loadUrl(qmlfile);
+            // END benchmarked code block
+            qint64 etime = et.nsecsElapsed();
+            nResults.append(etime);
+        }
     }
+
+    // sort the list
+    qSort(nResults);
+
+    // remove IGNORE_N_OUTLIERS*2 from ONLY the worst end (remove gc interference)
+    for (int i = 0; i < IGNORE_N_OUTLIERS; ++i) {
+        if (!nResults.isEmpty()) nResults.removeLast();
+        if (!nResults.isEmpty()) nResults.removeLast();
+    }
+
+    // now generate an average
+    qint64 totaltime = 0;
+    if (nResults.size() == 0) nResults.append(9999);
+    for (int i = 0; i < nResults.size(); ++i)
+        totaltime += nResults.at(i);
+    double average = ((double)totaltime) / nResults.count();
+
+    // and return it as the result
+    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds);
+    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); // twice to workaround bug in QTestLib
 }
 
+// This method is intended to benchmark the amount of time / cpu cycles
+// required to compile and instantiate the given QML input,
+// where the QML state has NOT been cleared in between each iteration.
+// Thus, cached type data should be used when instantiating the object.
+//
+// The benchmark result is expected to be dominated by QObject
+// hierarchy construction and first-time binding evaluation.
 void tst_librarymetrics_performance::instantiation_cached()
 {
     QFETCH(QUrl, qmlfile);
+
     cleanState(&e);
+    QList<qint64> nResults;
 
-    QBENCHMARK {
+    // generate AVERAGE_OVER_N results
+    for (int i = 0; i < AVERAGE_OVER_N; ++i) {
+        QElapsedTimer et;
+        et.start();
+        // BEGIN benchmarked code block
         QQmlComponent c(e, this);
-        c.loadUrl(qmlfile); // just compile.
+        c.loadUrl(qmlfile);
         QObject *o = c.create();
+        // END benchmarked code block
+        qint64 etime = et.nsecsElapsed();
+        nResults.append(etime);
         delete o;
     }
+
+    // sort the list
+    qSort(nResults);
+
+    // remove IGNORE_N_OUTLIERS*2 from ONLY the worst end (remove gc interference)
+    for (int i = 0; i < IGNORE_N_OUTLIERS; ++i) {
+        if (!nResults.isEmpty()) nResults.removeLast();
+        if (!nResults.isEmpty()) nResults.removeLast();
+    }
+
+    // now generate an average
+    qint64 totaltime = 0;
+    if (nResults.size() == 0) nResults.append(9999);
+    for (int i = 0; i < nResults.size(); ++i)
+        totaltime += nResults.at(i);
+    double average = ((double)totaltime) / nResults.count();
+
+    // and return it as the result
+    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds);
+    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); // twice to workaround bug in QTestLib
 }
 
+// This method is intended to benchmark the amount of time / cpu cycles
+// required to compile and instantiate the given QML input,
+// where the QML state has been cleared in between each iteration.
+// This will cause the engine to parse, compile and optimize the
+// input QML in each iteration.  After compilation, the component
+// will be instantiated, and so QObject hierarchy construction and
+// first time binding evaluation will contribute to the result.
+//
+// The compilation phase is expected to dominate the result, however
+// in some cases (complex positioning via expensive bindings, or
+// other pathological cases) instantiation may dominate.  Those
+// cases are prime candidates for further investigation...
 void tst_librarymetrics_performance::instantiation()
 {
     QFETCH(QUrl, qmlfile);
 
-    QBENCHMARK {
+    cleanState(&e);
+    QList<qint64> nResults;
+
+    // generate AVERAGE_OVER_N results
+    for (int i = 0; i < AVERAGE_OVER_N; ++i) {
         cleanState(&e);
-        QQmlComponent c(e, this);
-        c.loadUrl(qmlfile); // just compile.
-        QObject *o = c.create();
-        delete o;
+        {
+            QElapsedTimer et;
+            et.start();
+            // BEGIN benchmarked code block
+            QQmlComponent c(e, this);
+            c.loadUrl(qmlfile);
+            QObject *o = c.create();
+            // END benchmarked code block
+            qint64 etime = et.nsecsElapsed();
+            nResults.append(etime);
+            delete o;
+        }
+    }
+
+    // sort the list
+    qSort(nResults);
+
+    // remove IGNORE_N_OUTLIERS*2 from ONLY the worst end (remove gc interference)
+    for (int i = 0; i < IGNORE_N_OUTLIERS; ++i) {
+        if (!nResults.isEmpty()) nResults.removeLast();
+        if (!nResults.isEmpty()) nResults.removeLast();
     }
+
+    // now generate an average
+    qint64 totaltime = 0;
+    if (nResults.size() == 0) nResults.append(9999);
+    for (int i = 0; i < nResults.size(); ++i)
+        totaltime += nResults.at(i);
+    double average = ((double)totaltime) / nResults.count();
+
+    // and return it as the result
+    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds);
+    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); // twice to workaround bug in QTestLib
 }
 
 void tst_librarymetrics_performance::positioners_data()
@@ -256,19 +389,58 @@ void tst_librarymetrics_performance::positioners_data()
     QTest::newRow("07) positioning - binding (with grid) positioning") << testFileUrl("data/bindingwithgridpositioning.2.qml");
 }
 
-// this test triggers repositioning a large number of times,
+// This method triggers repositioning a large number of times,
 // so we can track the cost of different repositioning methods.
+// Note that the engine state is cleared before every iteration,
+// so the benchmark result will include the cost of compilation
+// as well as instantiation and first-time binding evaluation.
+//
+// The repositioning triggered within the QML is expected
+// to dominate the benchmark time, especially if slow-path
+// binding evaluation occurs.
 void tst_librarymetrics_performance::positioners()
 {
     QFETCH(QUrl, qmlfile);
 
-    QBENCHMARK {
+    cleanState(&e);
+    QList<qint64> nResults;
+
+    // generate AVERAGE_OVER_N results
+    for (int i = 0; i < AVERAGE_OVER_N; ++i) {
         cleanState(&e);
-        QQmlComponent c(e, this);
-        c.loadUrl(qmlfile); // just compile.
-        QObject *o = c.create();
-        delete o;
+        {
+            QElapsedTimer et;
+            et.start();
+            // BEGIN benchmarked code block
+            QQmlComponent c(e, this);
+            c.loadUrl(qmlfile);
+            QObject *o = c.create();
+            // END benchmarked code block
+            qint64 etime = et.nsecsElapsed();
+            nResults.append(etime);
+            delete o;
+        }
     }
+
+    // sort the list
+    qSort(nResults);
+
+    // remove IGNORE_N_OUTLIERS*2 from ONLY the worst end (remove gc interference)
+    for (int i = 0; i < IGNORE_N_OUTLIERS; ++i) {
+        if (!nResults.isEmpty()) nResults.removeLast();
+        if (!nResults.isEmpty()) nResults.removeLast();
+    }
+
+    // now generate an average
+    qint64 totaltime = 0;
+    if (nResults.size() == 0) nResults.append(9999);
+    for (int i = 0; i < nResults.size(); ++i)
+        totaltime += nResults.at(i);
+    double average = ((double)totaltime) / nResults.count();
+
+    // and return it as the result
+    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds);
+    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); // twice to workaround bug in QTestLib
 }
 
 QTEST_MAIN(tst_librarymetrics_performance)
diff --git a/tests/benchmarks/qml/painting/paintbenchmark.cpp b/tests/benchmarks/qml/painting/paintbenchmark.cpp
index 0a9dee4664..d195675ab8 100644
--- a/tests/benchmarks/qml/painting/paintbenchmark.cpp
+++ b/tests/benchmarks/qml/painting/paintbenchmark.cpp
@@ -36,6 +36,7 @@
 #include <QVBoxLayout>
 #include <QTime>
 #include <QDebug>
+#include <QRandomGenerator>
 #include <QStaticText>
 
 int iterations = 20;
@@ -321,7 +322,7 @@ public:
         int len = strlen(chars);
         for (int i = 0; i < lines; ++i) {
             for (int j = 0; j < 60; j++) {
-                strings[i] += QChar(chars[rand() % len]);
+                strings[i] += QChar(chars[QRandomGenerator::global()->bounded(len)]);
             }
         }
     }
diff --git a/tests/benchmarks/quick/events/data/mouseevent.qml b/tests/benchmarks/quick/events/data/mouseevent.qml
new file mode 100644
index 0000000000..0959cc025e
--- /dev/null
+++ b/tests/benchmarks/quick/events/data/mouseevent.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.0
+
+Item {
+    id: root
+    width: 400
+    height: 400
+    MouseArea {
+        anchors.fill: parent
+    }
+
+    Item {
+        width: 400
+        height: 400
+
+        MouseArea {
+            objectName: "mouseArea"
+            anchors.fill: parent
+        }
+    }
+}
diff --git a/tests/benchmarks/quick/events/data/touchevent.qml b/tests/benchmarks/quick/events/data/touchevent.qml
new file mode 100644
index 0000000000..f9a4c84189
--- /dev/null
+++ b/tests/benchmarks/quick/events/data/touchevent.qml
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.0
+
+Item {
+    id: root
+    width: 400
+    height: 400
+
+    MouseArea {
+        anchors.fill: parent
+    }
+
+    Item {
+        width: 400
+        height: 400
+
+        MultiPointTouchArea {
+            anchors.fill: parent
+            touchPoints: [ TouchPoint { id: point1 }]
+            touchPoints: [ TouchPoint { id: point2 }]
+        }
+    }
+}
diff --git a/tests/benchmarks/quick/events/events.pro b/tests/benchmarks/quick/events/events.pro
new file mode 100644
index 0000000000..88e85d0278
--- /dev/null
+++ b/tests/benchmarks/quick/events/events.pro
@@ -0,0 +1,11 @@
+CONFIG += benchmark
+TEMPLATE = app
+TARGET = tst_qevents
+QT += quick quick-private qml testlib
+macos:CONFIG -= app_bundle
+
+SOURCES += tst_events.cpp
+
+include (../../../auto/shared/util.pri)
+include (../../../auto/quick/shared/util.pri)
+
diff --git a/tests/benchmarks/quick/events/tst_events.cpp b/tests/benchmarks/quick/events/tst_events.cpp
new file mode 100644
index 0000000000..344842153b
--- /dev/null
+++ b/tests/benchmarks/quick/events/tst_events.cpp
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QtQuick>
+#include <QtQuick/private/qquickmousearea_p.h>
+#include <QDebug>
+#include "../../../auto/shared/util.h"
+#include "../../../auto/quick/shared/viewtestutil.h"
+
+
+class TestView : public QQuickView
+{
+public:
+    void handleEvent(QEvent *ev) { event(ev); }
+};
+
+
+class tst_events : public QQmlDataTest
+{
+    Q_OBJECT
+
+private slots:
+    void mousePressRelease();
+    void mouseMove();
+    void touchToMousePressRelease();
+    void touchToMousePressMove();
+
+public slots:
+    void initTestCase() {
+        QQmlDataTest::initTestCase();
+        window.setBaseSize(QSize(400, 400));
+        window.setSource(testFileUrl("mouseevent.qml"));
+        window.show();
+        QVERIFY(QTest::qWaitForWindowExposed(&window));
+    }
+
+private:
+    TestView window;
+};
+
+void tst_events::mousePressRelease()
+{
+    QQuickMouseArea *mouseArea = window.rootObject()->findChild<QQuickMouseArea *>("mouseArea");
+    QCOMPARE(mouseArea->pressed(), false);
+
+    QBENCHMARK {
+        QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
+        window.handleEvent(&pressEvent);
+        QCOMPARE(mouseArea->pressed(), true);
+        QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
+        window.handleEvent(&releaseEvent);
+    }
+    QCOMPARE(mouseArea->pressed(), false);
+}
+
+void tst_events::mouseMove()
+{
+    QQuickMouseArea *mouseArea = window.rootObject()->findChild<QQuickMouseArea *>("mouseArea");
+    QCOMPARE(mouseArea->pressed(), false);
+
+    QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
+    window.handleEvent(&pressEvent);
+    QCOMPARE(mouseArea->pressed(), true);
+    QMouseEvent moveEvent1(QEvent::MouseMove, QPoint(101, 100), Qt::LeftButton, Qt::LeftButton, 0);
+    QMouseEvent moveEvent2(QEvent::MouseMove, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
+    QBENCHMARK {
+        window.handleEvent(&moveEvent1);
+        window.handleEvent(&moveEvent2);
+    }
+    QCOMPARE(mouseArea->pressed(), true);
+    QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
+    window.handleEvent(&releaseEvent);
+    QCOMPARE(mouseArea->pressed(), false);
+}
+
+void tst_events::touchToMousePressRelease()
+{
+    QQuickMouseArea *mouseArea = window.rootObject()->findChild<QQuickMouseArea *>("mouseArea");
+    QCOMPARE(mouseArea->pressed(), false);
+
+    auto device = QTest::createTouchDevice();
+    auto p = QPoint(80, 80);
+
+    QBENCHMARK {
+        QTest::touchEvent(&window, device).press(0, p, &window).commit();
+        QCOMPARE(mouseArea->pressed(), true);
+        QTest::touchEvent(&window, device).release(0, p, &window).commit();
+    }
+    QCOMPARE(mouseArea->pressed(), false);
+}
+
+void tst_events::touchToMousePressMove()
+{
+    QQuickMouseArea *mouseArea = window.rootObject()->findChild<QQuickMouseArea *>("mouseArea");
+    QCOMPARE(mouseArea->pressed(), false);
+
+    auto device = QTest::createTouchDevice();
+    auto p = QPoint(80, 80);
+    auto p2 = QPoint(81, 80);
+
+    QTest::touchEvent(&window, device).press(0, p, &window).commit();
+    QQuickTouchUtils::flush(&window);
+    QCOMPARE(mouseArea->pressed(), true);
+
+    QBENCHMARK {
+        QTest::touchEvent(&window, device).move(0, p, &window).commit();
+        QCOMPARE(mouseArea->pressed(), true);
+        QTest::touchEvent(&window, device).move(0, p2, &window).commit();
+    }
+    QCOMPARE(mouseArea->pressed(), true);
+    QTest::touchEvent(&window, device).release(0, p, &window).commit();
+    QQuickTouchUtils::flush(&window);
+    QCOMPARE(mouseArea->pressed(), false);
+}
+
+QTEST_MAIN(tst_events)
+#include "tst_events.moc"
diff --git a/tests/benchmarks/quick/quick.pro b/tests/benchmarks/quick/quick.pro
new file mode 100644
index 0000000000..87df78bd2f
--- /dev/null
+++ b/tests/benchmarks/quick/quick.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+           events