From dc558b69f083c89aa8c02952e5f167405939a61a Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Thu, 25 Feb 2016 16:51:39 +0100
Subject: Added change log for 5.6.0

Change-Id: I22db5616d9f2e02cb0126ff427a5bdd4423b5fc9
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 dist/changes-5.6.0 | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 dist/changes-5.6.0

diff --git a/dist/changes-5.6.0 b/dist/changes-5.6.0
new file mode 100644
index 0000000000..c56fb4355b
--- /dev/null
+++ b/dist/changes-5.6.0
@@ -0,0 +1,158 @@
+Qt 5.6 introduces many new features and improvements as well as bugfixes
+over the 5.5.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+QtQml
+-----
+
+ - Enabled Just-In-Time compilation for JavaScript on MIPS
+
+ - ObjectModel:
+   * Added get(), append(), insert(), move() and remove() methods.
+
+ - Profiling:
+   * QtQml can now write additional information so that perf is able to give
+     function names of JavaScript methods when profiling. To enable this, set
+     the environment variable QV4_PROFILE_WRITE_PERF_MAP=1 when running the
+     process in question.
+
+ - XMLHttpRequest:
+   * Added support for the PROPFIND method in HTTP requests.
+   * Added support for the "json" binary response type.
+   * Fixed a memory leak in the use of the responseXML property.
+
+ - qml tool:
+   * The qml tool now quits immediately if Qt.quit() is called before all scenes
+     complete creation.
+   * Make it possible to make script without .qml suffix
+
+ - QJSEngine:
+   * Introduced an extension API that allows installing various function and
+     object extensions (qsTr(), console.log(), etc.) to QJSEngine.
+     installTranslatorFunctions() was deprecated in favor of the new extension
+     API (see installExtensions()).
+
+ - QQmlComponent:
+   * Synchronously complete the loading of an asynchronous QQmlComponent, if a
+     PreferSynchronous QQmlComponent is created for the same url (provided that
+     this url does support synchronous loading).
+
+ - URLs from Qt.include() are now passed through the URL interceptor (if
+   present).
+
+QtQuick
+-------
+
+ - Added padding, leftPadding, topPadding, rightPadding and bottomPadding
+   properties to Text, TextInput, TextEdit in addition to all positioning items,
+   such as Column, Row, Grid, and Flow.
+
+ - Items may now listen for the ItemDevicePixelRatioHasChanged event in
+   QQuickItem::itemChange() in order to become aware of when DPI scaling has
+   changed (for instance, when the window has moved to a different screen).
+   Text elements take advantage of this in order to rerender when the DPI has
+   changed.
+
+ - Images now support looking for higher pixel ratios, not just @2x.
+
+ - Added the possibility to mirror the generated OpenGL texture via the newly
+   added Item::layer.textureMirroring and ShaderEffectSource::textureMirroring
+   properties.
+
+ - QQuickFramebufferObject:
+   * Added a mirrorVertically property to QQuickFramebufferObject.
+
+ - Shortcut:
+   * Added Shortcut.nativeText and portableText properties to read back the key
+     sequence as a string
+   * Added Shortcut.sequenceString property to read back the key sequence as a
+     displayable string
+
+ - Flickable:
+   * The movement related signals and properties are now updated for flicks
+     started via the flick function.
+   * Mouse wheel movement will no longer cause Flickable to overshoot past its
+     boundaries.
+
+ - Flipable:
+   * Flipable now toggles the 'enabled' property on whichever side is active.
+     This restores broken behavior compatibility with QtQuick1, and blocks
+     input to whichever side is not active.
+
+ - Item:
+   * Added EnterKey attached property that allows to change the appearance of
+     the Enter key on an on-screen keyboard.
+
+ - MultiPointTouchArea:
+   * Fixed released() signal duplication on mouseReleaseEvent.
+
+ - QQuickPaintedItem:
+   * Implement high-dpi support and add function textureSize. This obsoletes
+     the existing contentsSize, contentsScale and contentsBoundingRect
+     functions.
+   * A QQuickPaintedItem with Item.layer set will now include child items in the
+     layer.
+
+ - QQuickWindow:
+   * Add TextureIsOpaque option to createTextureFromImage()
+   * Added a render job stage: NoStage. This allows scheduling jobs for
+     execution on the render thread.
+
+ - Repeater:
+   * Positioners will now always ignore Repeaters. Previously, Repeaters were
+     ignored by positioners when their width or height were 0.
+
+ - Text:
+   * Fixed baseline of Text elements where the vertical alignment was something
+     other than top.
+
+ - TextEdit:
+   * Add an editingFinished signal, emitted when the text edit loses focus. This
+     mirrors the same signal already available on TextInput since Qt 5.2.
+
+ - Item Views:
+   * positionViewAtIndex() will now reliably work on a view with a sticky
+     header/footer set.
+   * ListView no longer ends up with "holes" between delegates (or missing
+     delegates) under some circumstances.
+
+QuickTest
+---------
+
+ - TestCase:
+   * Added equals() function to image object returned from TestCase's
+     grabImage() function.
+   * Key events in TestCase are now sent to the window with active focus,
+     meaning that tests that create custom windows can receive key events.
+
+QtQuick.Particles
+-----------------
+
+ - Turbulence:
+   * Noise source image is now correctly read from QRC files as well as local
+     files.
+
+Qt.labs.folderlistmodel
+-----------------------
+
+ - FolderListModel:
+   * Add an indexOf(file) function to determine the index of a given file.
+
-- 
cgit v1.2.3


From e688500eec604dcbe3ca58aecee9d697a8f2c5f6 Mon Sep 17 00:00:00 2001
From: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Date: Tue, 8 Mar 2016 10:39:27 +0100
Subject: Doc: Replace the reference to QQmlComponent::endCreate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic1bf883003f6e20efa3fdba9ad29a8c8276b043e
Task-number: QTBUG-51713
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
---
 src/qml/qml/qqmlincubator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index 63604d4622..a568ae440c 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -681,7 +681,7 @@ void QQmlIncubator::statusChanged(Status status)
 Called after the \a object is first created, but before property bindings are
 evaluated and, if applicable, QQmlParserStatus::componentComplete() is
 called.  This is equivalent to the point between QQmlComponent::beginCreate()
-and QQmlComponent::endCreate(), and can be used to assign initial values
+and QQmlComponent::completeCreate(), and can be used to assign initial values
 to the object's properties.
 
 The default implementation does nothing.
-- 
cgit v1.2.3


From c0a7055ee6dd20202c9b5119a233e5fb47ab695e Mon Sep 17 00:00:00 2001
From: Nico Vertriest <nico.vertriest@theqtcompany.com>
Date: Wed, 3 Feb 2016 13:53:14 +0100
Subject: Doc: Modified qtquick.qdocconf to exclude private header file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ib9bdd42ca47853e343c26bc9d1b9c563b75af4f7
Task-number: QTBUG-43810
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
---
 src/quick/doc/qtquick.qdocconf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 044c1696ff..63ada10fce 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -65,6 +65,7 @@ sourcedirs += ../../plugins
 excludedirs += ../../imports/models \
                ../../imports/statemachine
 
+excludefiles += ../util/qquickpropertychanges_p.h
 examples.fileextensions        += "*.qm"
 
 manifestmeta.thumbnail.names += "QtQuick/Threaded ListModel Example" \
-- 
cgit v1.2.3


From cfef926777bd7b9a48f9946d2b1c46ef68a3af7d Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Wed, 9 Mar 2016 14:05:04 +0100
Subject: Fix error message when Python could not be found

The python script works with Python 2 as well as version 3.

Task-number: QTBUG-51753
Change-Id: I630b7b1811e9896e30b7ba75af972552f1063eff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 qtdeclarative.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qtdeclarative.pro b/qtdeclarative.pro
index 0e746c3c65..5b94da9b69 100644
--- a/qtdeclarative.pro
+++ b/qtdeclarative.pro
@@ -3,7 +3,7 @@ load(qt_parts)
 
 !python_available {
     py_out = $$system('python -c "print(1)"')
-    !equals(py_out, 1): error("Building QtQml requires Python version 2.")
+    !equals(py_out, 1): error("Building QtQml requires Python.")
     tmp = python_available
     CONFIG += $$tmp
     cache(CONFIG, add, tmp)
-- 
cgit v1.2.3


From 3f47a108bc7862afda1f796ca45096878d88ff4d Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 21 Feb 2016 22:31:00 -0800
Subject: Remove unused variable

Found by ICC.

Change-Id: I0c94a5c2846b48c8aea7ffff14352fd8573cbf66
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 src/quick/util/qquickpixmapcache.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index 36374e628e..230c31807c 100644
--- a/src/quick/util/qquickpixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -509,7 +509,6 @@ void QQuickPixmapReader::asyncResponseFinished(QQuickImageResponse *response)
         QQuickTextureFactory *t = 0;
         QQuickPixmapReply::ReadError error = QQuickPixmapReply::NoError;
         QString errorString;
-        QSize readSize;
         if (!response->errorString().isEmpty()) {
             error = QQuickPixmapReply::Loading;
             errorString = response->errorString();
-- 
cgit v1.2.3


From a05f3ee00c903c5fa5965187c72dae04f960e2e4 Mon Sep 17 00:00:00 2001
From: Joni Poikelin <joni.poikelin@theqtcompany.com>
Date: Thu, 10 Mar 2016 09:19:24 +0200
Subject: Prevent worker thread of FolderListModel from starting immediately

Worker thead may have started iterating through filesystem before
component was completely initialized, resulting in unnecessary and
unexpected results.

Task-number: QTBUG-49898
Change-Id: Ibaa2572139b0aed2fdc9bd3bbcdffa58791e38d7
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 src/imports/folderlistmodel/fileinfothread.cpp        | 1 -
 src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/imports/folderlistmodel/fileinfothread.cpp b/src/imports/folderlistmodel/fileinfothread.cpp
index ebdfba42a8..b9cc9cac22 100644
--- a/src/imports/folderlistmodel/fileinfothread.cpp
+++ b/src/imports/folderlistmodel/fileinfothread.cpp
@@ -59,7 +59,6 @@ FileInfoThread::FileInfoThread(QObject *parent)
     connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(dirChanged(QString)));
     connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(updateFile(QString)));
 #endif // !QT_NO_FILESYSTEMWATCHER
-    start(LowPriority);
 }
 
 FileInfoThread::~FileInfoThread()
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 8bfbf09769..d01fc5e74e 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -531,6 +531,7 @@ void QQuickFolderListModel::componentComplete()
     QString localPath = QQmlFile::urlToLocalFileOrQrc(d->currentDir);
     if (localPath.isEmpty() || !QDir(localPath).exists())
         setFolder(QUrl::fromLocalFile(QDir::currentPath()));
+    d->fileInfoThread.start(QThread::LowPriority);
 }
 
 /*!
-- 
cgit v1.2.3


From 4c065b497e63832cf610cc06d67a7b40965154fb Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@viroteck.net>
Date: Tue, 6 Jan 2015 19:29:08 +0100
Subject: qmltime: Remove widgets dependency.

To do this easily while retaining the meaning of the -parent flag, we add a
private export to QQuickView so that we can set the root object.

Change-Id: Iabb2b998816a6fdfcc8417f679c96f04910b8202
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
---
 src/quick/items/qquickview_p.h           |  2 +-
 tests/benchmarks/qml/qmltime/qmltime.cpp | 34 +++++++++++++++++---------------
 tests/benchmarks/qml/qmltime/qmltime.pro |  3 ++-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index 6f970f959d..71b39f5b0f 100644
--- a/src/quick/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -70,7 +70,7 @@ class QQmlError;
 class QQuickItem;
 class QQmlComponent;
 
-class QQuickViewPrivate : public QQuickWindowPrivate,
+class Q_QUICK_PRIVATE_EXPORT QQuickViewPrivate : public QQuickWindowPrivate,
                        public QQuickItemChangeListener
 {
     Q_DECLARE_PUBLIC(QQuickView)
diff --git a/tests/benchmarks/qml/qmltime/qmltime.cpp b/tests/benchmarks/qml/qmltime/qmltime.cpp
index bd8477164a..2abe71fb4c 100644
--- a/tests/benchmarks/qml/qmltime/qmltime.cpp
+++ b/tests/benchmarks/qml/qmltime/qmltime.cpp
@@ -33,11 +33,13 @@
 #include <QQmlEngine>
 #include <QQmlComponent>
 #include <QDebug>
-#include <QApplication>
+#include <QGuiApplication>
 #include <QTime>
 #include <QQmlContext>
-#include <QGraphicsScene>
-#include <QGraphicsRectItem>
+#include <QQuickView>
+#include <QQuickItem>
+
+#include <private/qquickview_p.h>
 
 class Timer : public QObject
 {
@@ -64,22 +66,22 @@ private:
     static Timer *m_timer;
 
     bool m_willparent;
-    QGraphicsScene m_scene;
-    QGraphicsRectItem m_item;
+    QQuickView m_view;
+    QQuickItem *m_item;
 };
 QML_DECLARE_TYPE(Timer);
 
 Timer *Timer::m_timer = 0;
 
 Timer::Timer()
-: m_component(0), m_willparent(false)
+    : m_component(0)
+    , m_willparent(false)
+    , m_item(new QQuickItem)
 {
     if (m_timer)
         qWarning("Timer: Timer already registered");
+    QQuickViewPrivate::get(&m_view)->setRootObject(m_item);
     m_timer = this;
-
-    m_scene.setItemIndexMethod(QGraphicsScene::NoIndex);
-    m_scene.addItem(&m_item);
 }
 
 QQmlComponent *Timer::component() const
@@ -102,9 +104,9 @@ void Timer::run(uint iterations)
     QQmlContext context(qmlContext(this));
 
     QObject *o = m_component->create(&context);
-    QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o);
-    if (m_willparent && go)
-        go->setParentItem(&m_item);
+    QQuickItem *i = qobject_cast<QQuickItem *>(o);
+    if (m_willparent && i)
+        i->setParentItem(m_item);
     delete o;
 
     runTest(&context, iterations);
@@ -126,9 +128,9 @@ void Timer::runTest(QQmlContext *context, uint iterations)
     t.start();
     for (uint ii = 0; ii < iterations; ++ii) {
         QObject *o = m_component->create(context);
-        QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o);
-        if (m_willparent && go)
-            go->setParentItem(&m_item);
+        QQuickItem *i = qobject_cast<QQuickItem *>(o);
+        if (m_willparent && i)
+            i->setParentItem(m_item);
         delete o;
     }
 
@@ -207,7 +209,7 @@ void usage(const char *name)
 
 int main(int argc, char ** argv)
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     qmlRegisterType<Timer>("QmlTime", 1, 0, "Timer");
 
diff --git a/tests/benchmarks/qml/qmltime/qmltime.pro b/tests/benchmarks/qml/qmltime/qmltime.pro
index 4e3e9471a4..fa93e91af0 100644
--- a/tests/benchmarks/qml/qmltime/qmltime.pro
+++ b/tests/benchmarks/qml/qmltime/qmltime.pro
@@ -1,7 +1,8 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = qmltime
-QT += qml widgets testlib
+QT += qml testlib quick
+QT += quick-private
 macx:CONFIG -= app_bundle
 
 SOURCES += qmltime.cpp
-- 
cgit v1.2.3


From c19590f72012168f4e6ea1a3f7e55cb080919a34 Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@viroteck.net>
Date: Fri, 11 Mar 2016 09:45:26 +0100
Subject: Move qmltime out of benchmarks directory.

This is a tool, not a benchmark.

Change-Id: Ie6b4452a1235923e1663a8a525ddad8408d21545
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 tests/benchmarks/qml/qml.pro                       |   1 -
 tests/benchmarks/qml/qmltime/example.qml           |  47 ----
 tests/benchmarks/qml/qmltime/linelaidout.qml       |  54 ----
 tests/benchmarks/qml/qmltime/qmltime.cpp           | 277 ---------------------
 tests/benchmarks/qml/qmltime/qmltime.pro           |  10 -
 .../benchmarks/qml/qmltime/tests/anchors/empty.qml |  67 -----
 .../benchmarks/qml/qmltime/tests/anchors/fill.qml  |  74 ------
 .../benchmarks/qml/qmltime/tests/anchors/null.qml  |  60 -----
 .../qml/qmltime/tests/animation/large.qml          |  74 ------
 .../qml/qmltime/tests/animation/largeNoProps.qml   |  74 ------
 .../qml/qmltime/tests/item_creation/children.qml   |  67 -----
 .../qml/qmltime/tests/item_creation/data.qml       |  67 -----
 .../qmltime/tests/item_creation/no_creation.qml    |  45 ----
 .../qml/qmltime/tests/item_creation/resources.qml  |  67 -----
 .../benchmarks/qml/qmltime/tests/loader/Loaded.qml |  40 ---
 .../qml/qmltime/tests/loader/component_loader.qml  |  49 ----
 .../qml/qmltime/tests/loader/empty_loader.qml      |  48 ----
 .../qml/qmltime/tests/loader/no_loader.qml         |  47 ----
 .../qml/qmltime/tests/loader/source_loader.qml     |  49 ----
 .../tests/positioner_creation/no_positioner.qml    |  70 ------
 .../tests/positioner_creation/null_positioner.qml  |  67 -----
 .../tests/positioner_creation/positioner.qml       |  70 ------
 .../qml/qmltime/tests/vmemetaobject/null.qml       |  46 ----
 .../qml/qmltime/tests/vmemetaobject/property.qml   |  51 ----
 tests/benchmarks/qml/qmltime/textingrid.qml        |  65 -----
 tools/qmltime/example.qml                          |  47 ++++
 tools/qmltime/linelaidout.qml                      |  54 ++++
 tools/qmltime/qmltime.cpp                          | 277 +++++++++++++++++++++
 tools/qmltime/qmltime.pro                          |  10 +
 tools/qmltime/tests/anchors/empty.qml              |  67 +++++
 tools/qmltime/tests/anchors/fill.qml               |  74 ++++++
 tools/qmltime/tests/anchors/null.qml               |  60 +++++
 tools/qmltime/tests/animation/large.qml            |  74 ++++++
 tools/qmltime/tests/animation/largeNoProps.qml     |  74 ++++++
 tools/qmltime/tests/item_creation/children.qml     |  67 +++++
 tools/qmltime/tests/item_creation/data.qml         |  67 +++++
 tools/qmltime/tests/item_creation/no_creation.qml  |  45 ++++
 tools/qmltime/tests/item_creation/resources.qml    |  67 +++++
 tools/qmltime/tests/loader/Loaded.qml              |  40 +++
 tools/qmltime/tests/loader/component_loader.qml    |  49 ++++
 tools/qmltime/tests/loader/empty_loader.qml        |  48 ++++
 tools/qmltime/tests/loader/no_loader.qml           |  47 ++++
 tools/qmltime/tests/loader/source_loader.qml       |  49 ++++
 .../tests/positioner_creation/no_positioner.qml    |  70 ++++++
 .../tests/positioner_creation/null_positioner.qml  |  67 +++++
 .../tests/positioner_creation/positioner.qml       |  70 ++++++
 tools/qmltime/tests/vmemetaobject/null.qml         |  46 ++++
 tools/qmltime/tests/vmemetaobject/property.qml     |  51 ++++
 tools/qmltime/textingrid.qml                       |  65 +++++
 tools/tools.pro                                    |   7 +-
 50 files changed, 1591 insertions(+), 1587 deletions(-)
 delete mode 100644 tests/benchmarks/qml/qmltime/example.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/linelaidout.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/qmltime.cpp
 delete mode 100644 tests/benchmarks/qml/qmltime/qmltime.pro
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/anchors/empty.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/anchors/fill.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/anchors/null.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/animation/large.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/animation/largeNoProps.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/item_creation/children.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/item_creation/data.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/item_creation/no_creation.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/item_creation/resources.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/loader/Loaded.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/loader/component_loader.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/loader/empty_loader.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/loader/no_loader.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/loader/source_loader.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/positioner_creation/no_positioner.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/positioner_creation/null_positioner.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/positioner_creation/positioner.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/vmemetaobject/null.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/tests/vmemetaobject/property.qml
 delete mode 100644 tests/benchmarks/qml/qmltime/textingrid.qml
 create mode 100644 tools/qmltime/example.qml
 create mode 100644 tools/qmltime/linelaidout.qml
 create mode 100644 tools/qmltime/qmltime.cpp
 create mode 100644 tools/qmltime/qmltime.pro
 create mode 100644 tools/qmltime/tests/anchors/empty.qml
 create mode 100644 tools/qmltime/tests/anchors/fill.qml
 create mode 100644 tools/qmltime/tests/anchors/null.qml
 create mode 100644 tools/qmltime/tests/animation/large.qml
 create mode 100644 tools/qmltime/tests/animation/largeNoProps.qml
 create mode 100644 tools/qmltime/tests/item_creation/children.qml
 create mode 100644 tools/qmltime/tests/item_creation/data.qml
 create mode 100644 tools/qmltime/tests/item_creation/no_creation.qml
 create mode 100644 tools/qmltime/tests/item_creation/resources.qml
 create mode 100644 tools/qmltime/tests/loader/Loaded.qml
 create mode 100644 tools/qmltime/tests/loader/component_loader.qml
 create mode 100644 tools/qmltime/tests/loader/empty_loader.qml
 create mode 100644 tools/qmltime/tests/loader/no_loader.qml
 create mode 100644 tools/qmltime/tests/loader/source_loader.qml
 create mode 100644 tools/qmltime/tests/positioner_creation/no_positioner.qml
 create mode 100644 tools/qmltime/tests/positioner_creation/null_positioner.qml
 create mode 100644 tools/qmltime/tests/positioner_creation/positioner.qml
 create mode 100644 tools/qmltime/tests/vmemetaobject/null.qml
 create mode 100644 tools/qmltime/tests/vmemetaobject/property.qml
 create mode 100644 tools/qmltime/textingrid.qml

diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index 9c7583cd3b..b80ead6072 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -11,7 +11,6 @@ SUBDIRS += \
            qqmlimage \
            qqmlmetaproperty \
 #            script \ ### FIXME: doesn't build
-           qmltime \
            js \
            qquickwindow
 
diff --git a/tests/benchmarks/qml/qmltime/example.qml b/tests/benchmarks/qml/qmltime/example.qml
deleted file mode 100644
index 3ef15d7567..0000000000
--- a/tests/benchmarks/qml/qmltime/example.qml
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    property string name: "Bob Smith"
-
-    QmlTime.Timer {
-        component: Item {
-            Text { text: name }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/qml/qmltime/linelaidout.qml b/tests/benchmarks/qml/qmltime/linelaidout.qml
deleted file mode 100644
index 90b7d14253..0000000000
--- a/tests/benchmarks/qml/qmltime/linelaidout.qml
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Text {
-            width: 480
-            height: width
-            text: "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31\n32\n33\n34\n35\n36\n37\n38\n39\n40\n41\n42"
-            color: "blue"
-            font.pixelSize: 15
-            font.bold: true
-
-            onLineLaidOut: {
-                line.x = (line.number % 7) * 70
-                line.y = Math.floor(line.number / 7.0) * 70
-            }
-        }
-    }
-}
diff --git a/tests/benchmarks/qml/qmltime/qmltime.cpp b/tests/benchmarks/qml/qmltime/qmltime.cpp
deleted file mode 100644
index 2abe71fb4c..0000000000
--- a/tests/benchmarks/qml/qmltime/qmltime.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QQmlEngine>
-#include <QQmlComponent>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QTime>
-#include <QQmlContext>
-#include <QQuickView>
-#include <QQuickItem>
-
-#include <private/qquickview_p.h>
-
-class Timer : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QQmlComponent *component READ component WRITE setComponent)
-
-public:
-    Timer();
-
-    QQmlComponent *component() const;
-    void setComponent(QQmlComponent *);
-
-    static Timer *timerInstance();
-
-    void run(uint);
-
-    bool willParent() const;
-    void setWillParent(bool p);
-
-private:
-    void runTest(QQmlContext *, uint);
-
-    QQmlComponent *m_component;
-    static Timer *m_timer;
-
-    bool m_willparent;
-    QQuickView m_view;
-    QQuickItem *m_item;
-};
-QML_DECLARE_TYPE(Timer);
-
-Timer *Timer::m_timer = 0;
-
-Timer::Timer()
-    : m_component(0)
-    , m_willparent(false)
-    , m_item(new QQuickItem)
-{
-    if (m_timer)
-        qWarning("Timer: Timer already registered");
-    QQuickViewPrivate::get(&m_view)->setRootObject(m_item);
-    m_timer = this;
-}
-
-QQmlComponent *Timer::component() const
-{
-    return m_component;
-}
-
-void Timer::setComponent(QQmlComponent *c)
-{
-    m_component = c;
-}
-
-Timer *Timer::timerInstance()
-{
-    return m_timer;
-}
-
-void Timer::run(uint iterations)
-{
-    QQmlContext context(qmlContext(this));
-
-    QObject *o = m_component->create(&context);
-    QQuickItem *i = qobject_cast<QQuickItem *>(o);
-    if (m_willparent && i)
-        i->setParentItem(m_item);
-    delete o;
-
-    runTest(&context, iterations);
-}
-
-bool Timer::willParent() const
-{
-    return m_willparent;
-}
-
-void Timer::setWillParent(bool p)
-{
-    m_willparent = p;
-}
-
-void Timer::runTest(QQmlContext *context, uint iterations)
-{
-    QTime t;
-    t.start();
-    for (uint ii = 0; ii < iterations; ++ii) {
-        QObject *o = m_component->create(context);
-        QQuickItem *i = qobject_cast<QQuickItem *>(o);
-        if (m_willparent && i)
-            i->setParentItem(m_item);
-        delete o;
-    }
-
-    int e = t.elapsed();
-
-    qWarning() << "Total:" << e << "ms, Per iteration:" << qreal(e) / qreal(iterations) << "ms";
-
-}
-
-void usage(const char *name)
-{
-    qWarning("Usage: %s [-iterations <count>] [-parent] <qml file>\n", name);
-
-    qWarning("qmltime is a tool for benchmarking the runtime cost of instantiating\n"
-    "a QML component. It is typically run as follows:\n"
-    "\n"
-    "%s path/to/benchmark.qml\n"
-    "\n"
-    "If the -parent option is specified, the component being measured will also\n"
-    "be parented to an item already in the scene.\n"
-    "\n"
-    "If the -iterations option is specified, the benchmark will run the specified\n"
-    "number of iterations. If -iterations is not specified, 1024 iterations\n"
-    "are performed.\n"
-    "\n"
-    "qmltime expects the file to be benchmarked to contain a certain structure.\n"
-    "Specifically, it requires the presence of a QmlTime.Timer element. For example,\n"
-    "say we wanted to benchmark the following list delegate:\n"
-    "\n"
-    "Rectangle {\n"
-    "    color: \"green\"\n"
-    "    width: 400; height: 100\n"
-    "    Text {\n"
-    "        anchors.centerIn: parent\n"
-    "        text: name\n"
-    "    }\n"
-    "}\n"
-    "\n"
-    "we would create a benchmark file that looks like this:\n"
-    "\n"
-    "import QtQuick 2.0\n"
-    "import QmlTime 1.0 as QmlTime\n"
-    "\n"
-    "Item {\n"
-    "\n"
-    "    property string name: \"Bob Smith\"\n"
-    "\n"
-    "    QmlTime.Timer {\n"
-    "        component: Rectangle {\n"
-    "            color: \"green\"\n"
-    "            width: 400; height: 100\n"
-    "            Text {\n"
-    "                anchors.centerIn: parent\n"
-    "                text: name\n"
-    "            }\n"
-    "        }\n"
-    "    }\n"
-    "}\n"
-    "\n"
-    "The outer Item functions as a dummy data provider for any additional\n"
-    "data required by the bindings in the component being benchmarked (in the\n"
-    "example above we provide a \"name\" property).\n"
-    "\n"
-    "When started, the component is instantiated once before running\n"
-    "the benchmark, which means that the reported time does not include\n"
-    "compile time (as the results of compilation are cached internally).\n"
-    "In this sense the times reported by qmltime best correspond to the\n"
-    "costs associated with delegate creation in the view classes, where the\n"
-    "same delegate is instantiated over and over. Conversely, it is not a\n"
-    "good approximation for e.g. Loader, which typically only instantiates\n"
-    "an element once (and so for Loader the compile time is very relevant\n"
-    "to the overall cost).", name);
-
-    exit(-1);
-}
-
-int main(int argc, char ** argv)
-{
-    QGuiApplication app(argc, argv);
-
-    qmlRegisterType<Timer>("QmlTime", 1, 0, "Timer");
-
-    uint iterations = 1024;
-    QString filename;
-    bool willParent = false;
-
-    for (int ii = 1; ii < argc; ++ii) {
-        QByteArray arg(argv[ii]);
-
-        if (arg == "-iterations") {
-            if (ii + 1 < argc) {
-                ++ii;
-                QByteArray its(argv[ii]);
-                bool ok = false;
-                iterations = its.toUInt(&ok);
-                if (!ok)
-                    usage(argv[0]);
-            } else {
-                usage(argv[0]);
-            }
-        } else if (arg == "-parent") {
-            willParent = true;
-        } else if (arg == "-help") {
-            usage(argv[0]);
-        } else {
-            filename = QLatin1String(argv[ii]);
-        }
-    }
-
-    if (filename.isEmpty())
-        usage(argv[0]);
-
-    QQmlEngine engine;
-    QQmlComponent component(&engine, filename);
-    if (component.isError()) {
-        qWarning() << component.errors();
-        return -1;
-    }
-
-    QObject *obj = component.create();
-    if (!obj) {
-        qWarning() << component.errors();
-        return -1;
-    }
-
-    Timer *timer = Timer::timerInstance();
-    if (!timer) {
-        qWarning() << "A QmlTime.Timer instance is required.";
-        return -1;
-    }
-
-    timer->setWillParent(willParent);
-
-    if (!timer->component()) {
-        qWarning() << "The timer has no component";
-        return -1;
-    }
-
-    timer->run(iterations);
-
-    return 0;
-}
-
-#include "qmltime.moc"
diff --git a/tests/benchmarks/qml/qmltime/qmltime.pro b/tests/benchmarks/qml/qmltime/qmltime.pro
deleted file mode 100644
index fa93e91af0..0000000000
--- a/tests/benchmarks/qml/qmltime/qmltime.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG += testcase
-TEMPLATE = app
-TARGET = qmltime
-QT += qml testlib quick
-QT += quick-private
-macx:CONFIG -= app_bundle
-
-SOURCES += qmltime.cpp
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/qml/qmltime/tests/anchors/empty.qml b/tests/benchmarks/qml/qmltime/tests/anchors/empty.qml
deleted file mode 100644
index 309b4caa7e..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/anchors/empty.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-            }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/qml/qmltime/tests/anchors/fill.qml b/tests/benchmarks/qml/qmltime/tests/anchors/fill.qml
deleted file mode 100644
index df32da66e5..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/anchors/fill.qml
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-            }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/qml/qmltime/tests/anchors/null.qml b/tests/benchmarks/qml/qmltime/tests/anchors/null.qml
deleted file mode 100644
index 8a1ae0c25d..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/anchors/null.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Item {
-                }
-                Item {
-                }
-                Item {
-                }
-                Item {
-                }
-                Item {
-                }
-                Item {
-                }
-                Item {
-                }
-            }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/qml/qmltime/tests/animation/large.qml b/tests/benchmarks/qml/qmltime/tests/animation/large.qml
deleted file mode 100644
index 0c791961dd..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/animation/large.qml
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            ParallelAnimation {
-                NumberAnimation { duration: 500 }
-                NumberAnimation { duration: 4000; }
-                NumberAnimation { duration: 2000; easing.type: "OutBack"}
-                ColorAnimation { duration: 3000}
-                SequentialAnimation {
-                    PauseAnimation { duration: 1000 }
-                    ScriptAction { script: doSomething(); }
-                    PauseAnimation { duration: 800 }
-                    ScriptAction { script: doSomethingElse(); }
-                    PauseAnimation { duration: 800 }
-                    ParallelAnimation {
-                        NumberAnimation { duration: 200;}
-                        SequentialAnimation {
-                            PauseAnimation { duration: 200}
-                            ParallelAnimation {
-                                NumberAnimation { duration: 300;}
-                                NumberAnimation { duration: 300;}
-                            }
-                            NumberAnimation { from: 0; to: 1; duration: 500 }
-                            PauseAnimation { duration: 200 }
-                            NumberAnimation { from: 1; to: 0; duration: 500 }
-                        }
-                        SequentialAnimation {
-                            PauseAnimation { duration: 150}
-                            NumberAnimation { duration: 300; easing.type: "OutBounce" }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/animation/largeNoProps.qml b/tests/benchmarks/qml/qmltime/tests/animation/largeNoProps.qml
deleted file mode 100644
index 734ee46b77..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/animation/largeNoProps.qml
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            ParallelAnimation {
-                NumberAnimation { }
-                NumberAnimation { }
-                NumberAnimation { }
-                ColorAnimation { }
-                SequentialAnimation {
-                    PauseAnimation { }
-                    ScriptAction { }
-                    PauseAnimation { }
-                    ScriptAction { }
-                    PauseAnimation { }
-                    ParallelAnimation {
-                        NumberAnimation { }
-                        SequentialAnimation {
-                            PauseAnimation { }
-                            ParallelAnimation {
-                                NumberAnimation { }
-                                NumberAnimation { }
-                            }
-                            NumberAnimation { }
-                            PauseAnimation { }
-                            NumberAnimation { }
-                        }
-                        SequentialAnimation {
-                            PauseAnimation { }
-                            NumberAnimation { }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/item_creation/children.qml b/tests/benchmarks/qml/qmltime/tests/item_creation/children.qml
deleted file mode 100644
index 87085c1134..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/item_creation/children.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                children: [
-                    Rectangle { },
-                    Rectangle { },
-                    Item { },
-                    Image { },
-                    Text { },
-                    Item { },
-                    Item { },
-                    Image { },
-                    Image { },
-                    Row { },
-                    Image { },
-                    Image { },
-                    Column { },
-                    Row { },
-                    Text { },
-                    Text { },
-                    Text { },
-                    MouseArea { }
-                ]
-
-            }
-        }
-    }
-
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/item_creation/data.qml b/tests/benchmarks/qml/qmltime/tests/item_creation/data.qml
deleted file mode 100644
index 96804fda40..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/item_creation/data.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                data: [
-                    Rectangle { },
-                    Rectangle { },
-                    Item { },
-                    Image { },
-                    Text { },
-                    Item { },
-                    Item { },
-                    Image { },
-                    Image { },
-                    Row { },
-                    Image { },
-                    Image { },
-                    Column { },
-                    Row { },
-                    Text { },
-                    Text { },
-                    Text { },
-                    MouseArea { }
-                ]
-
-            }
-        }
-    }
-
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/item_creation/no_creation.qml b/tests/benchmarks/qml/qmltime/tests/item_creation/no_creation.qml
deleted file mode 100644
index 64561eb211..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/item_creation/no_creation.qml
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-            }
-        }
-    }
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/item_creation/resources.qml b/tests/benchmarks/qml/qmltime/tests/item_creation/resources.qml
deleted file mode 100644
index c896666b9a..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/item_creation/resources.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                resources: [
-                    Rectangle { },
-                    Rectangle { },
-                    Item { },
-                    Image { },
-                    Text { },
-                    Item { },
-                    Item { },
-                    Image { },
-                    Image { },
-                    Row { },
-                    Image { },
-                    Image { },
-                    Column { },
-                    Row { },
-                    Text { },
-                    Text { },
-                    Text { },
-                    MouseArea { }
-                ]
-
-            }
-        }
-    }
-
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/loader/Loaded.qml b/tests/benchmarks/qml/qmltime/tests/loader/Loaded.qml
deleted file mode 100644
index 8dedef1361..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/loader/Loaded.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    Rectangle {}
-    Text {}
-    Image {}
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/loader/component_loader.qml b/tests/benchmarks/qml/qmltime/tests/loader/component_loader.qml
deleted file mode 100644
index 9c245aeb21..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/loader/component_loader.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Loader {
-                    sourceComponent: Loaded {}
-                }
-            }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/qml/qmltime/tests/loader/empty_loader.qml b/tests/benchmarks/qml/qmltime/tests/loader/empty_loader.qml
deleted file mode 100644
index 9f288f8ad5..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/loader/empty_loader.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Loader {}
-                Loaded {}
-            }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/qml/qmltime/tests/loader/no_loader.qml b/tests/benchmarks/qml/qmltime/tests/loader/no_loader.qml
deleted file mode 100644
index c84b9d3dd6..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/loader/no_loader.qml
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Loaded {}
-            }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/qml/qmltime/tests/loader/source_loader.qml b/tests/benchmarks/qml/qmltime/tests/loader/source_loader.qml
deleted file mode 100644
index 41a1792d2c..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/loader/source_loader.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Loader {
-                    source: "Loaded.qml"
-                }
-            }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/qml/qmltime/tests/positioner_creation/no_positioner.qml b/tests/benchmarks/qml/qmltime/tests/positioner_creation/no_positioner.qml
deleted file mode 100644
index 09a3fb4321..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/positioner_creation/no_positioner.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Rectangle { }
-                Rectangle { }
-                Item {
-                    Image { }
-                    Text { }
-                }
-
-                Item {
-                    Item {
-                        Image { }
-                        Image { }
-                        Item {
-                            Image { }
-                            Image { }
-                        }
-                    }
-
-                    Item {
-                        Item {
-                            Text { }
-                            Text { }
-                        }
-                        Text { }
-                    }
-                }
-                MouseArea { }
-            }
-        }
-    }
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/positioner_creation/null_positioner.qml b/tests/benchmarks/qml/qmltime/tests/positioner_creation/null_positioner.qml
deleted file mode 100644
index 957688bcee..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/positioner_creation/null_positioner.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Rectangle { }
-                Rectangle { }
-                Item {
-                    Image { }
-                    Text { }
-                }
-
-                Item {
-                    Item {
-                        Image { }
-                        Image { }
-                        Row { }
-                        Image { }
-                        Image { }
-                    }
-
-                    Column { }
-                    Row { }
-                    Text { }
-                    Text { }
-                    Text { }
-                }
-                MouseArea { }
-            }
-        }
-    }
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/positioner_creation/positioner.qml b/tests/benchmarks/qml/qmltime/tests/positioner_creation/positioner.qml
deleted file mode 100644
index 4e6f08a1fe..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/positioner_creation/positioner.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Rectangle { }
-                Rectangle { }
-                Item {
-                    Image { }
-                    Text { }
-                }
-
-                Item {
-                    Item {
-                        Image { }
-                        Image { }
-                        Row {
-                            Image { }
-                            Image { }
-                        }
-                    }
-
-                    Column {
-                        Row {
-                            Text { }
-                            Text { }
-                        }
-                        Text { }
-                    }
-                }
-                MouseArea { }
-            }
-        }
-    }
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/vmemetaobject/null.qml b/tests/benchmarks/qml/qmltime/tests/vmemetaobject/null.qml
deleted file mode 100644
index f695c989a3..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/vmemetaobject/null.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            QtObject {
-            }
-        }
-    }
-
-}
diff --git a/tests/benchmarks/qml/qmltime/tests/vmemetaobject/property.qml b/tests/benchmarks/qml/qmltime/tests/vmemetaobject/property.qml
deleted file mode 100644
index f0ccabe2f0..0000000000
--- a/tests/benchmarks/qml/qmltime/tests/vmemetaobject/property.qml
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            QtObject {
-                property string s
-                property string s2
-                property string s3
-                property string s4
-            }
-        }
-    }
-
-}
-
diff --git a/tests/benchmarks/qml/qmltime/textingrid.qml b/tests/benchmarks/qml/qmltime/textingrid.qml
deleted file mode 100644
index 69dbdb5dd6..0000000000
--- a/tests/benchmarks/qml/qmltime/textingrid.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Grid {
-            width: 480
-            height: width
-
-            id: grid
-            columns: 7
-            rows: 6
-
-            Repeater {
-                model: 42
-                Text {
-                    width: grid.width / grid.columns; height: width
-                    color: "blue"
-                    text: index
-                    font.pixelSize: 15
-                    font.bold: true
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-
-                }
-            }
-
-        }
-    }
-}
-
diff --git a/tools/qmltime/example.qml b/tools/qmltime/example.qml
new file mode 100644
index 0000000000..3ef15d7567
--- /dev/null
+++ b/tools/qmltime/example.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    property string name: "Bob Smith"
+
+    QmlTime.Timer {
+        component: Item {
+            Text { text: name }
+        }
+    }
+}
+
diff --git a/tools/qmltime/linelaidout.qml b/tools/qmltime/linelaidout.qml
new file mode 100644
index 0000000000..90b7d14253
--- /dev/null
+++ b/tools/qmltime/linelaidout.qml
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Text {
+            width: 480
+            height: width
+            text: "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31\n32\n33\n34\n35\n36\n37\n38\n39\n40\n41\n42"
+            color: "blue"
+            font.pixelSize: 15
+            font.bold: true
+
+            onLineLaidOut: {
+                line.x = (line.number % 7) * 70
+                line.y = Math.floor(line.number / 7.0) * 70
+            }
+        }
+    }
+}
diff --git a/tools/qmltime/qmltime.cpp b/tools/qmltime/qmltime.cpp
new file mode 100644
index 0000000000..2abe71fb4c
--- /dev/null
+++ b/tools/qmltime/qmltime.cpp
@@ -0,0 +1,277 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QQmlEngine>
+#include <QQmlComponent>
+#include <QDebug>
+#include <QGuiApplication>
+#include <QTime>
+#include <QQmlContext>
+#include <QQuickView>
+#include <QQuickItem>
+
+#include <private/qquickview_p.h>
+
+class Timer : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QQmlComponent *component READ component WRITE setComponent)
+
+public:
+    Timer();
+
+    QQmlComponent *component() const;
+    void setComponent(QQmlComponent *);
+
+    static Timer *timerInstance();
+
+    void run(uint);
+
+    bool willParent() const;
+    void setWillParent(bool p);
+
+private:
+    void runTest(QQmlContext *, uint);
+
+    QQmlComponent *m_component;
+    static Timer *m_timer;
+
+    bool m_willparent;
+    QQuickView m_view;
+    QQuickItem *m_item;
+};
+QML_DECLARE_TYPE(Timer);
+
+Timer *Timer::m_timer = 0;
+
+Timer::Timer()
+    : m_component(0)
+    , m_willparent(false)
+    , m_item(new QQuickItem)
+{
+    if (m_timer)
+        qWarning("Timer: Timer already registered");
+    QQuickViewPrivate::get(&m_view)->setRootObject(m_item);
+    m_timer = this;
+}
+
+QQmlComponent *Timer::component() const
+{
+    return m_component;
+}
+
+void Timer::setComponent(QQmlComponent *c)
+{
+    m_component = c;
+}
+
+Timer *Timer::timerInstance()
+{
+    return m_timer;
+}
+
+void Timer::run(uint iterations)
+{
+    QQmlContext context(qmlContext(this));
+
+    QObject *o = m_component->create(&context);
+    QQuickItem *i = qobject_cast<QQuickItem *>(o);
+    if (m_willparent && i)
+        i->setParentItem(m_item);
+    delete o;
+
+    runTest(&context, iterations);
+}
+
+bool Timer::willParent() const
+{
+    return m_willparent;
+}
+
+void Timer::setWillParent(bool p)
+{
+    m_willparent = p;
+}
+
+void Timer::runTest(QQmlContext *context, uint iterations)
+{
+    QTime t;
+    t.start();
+    for (uint ii = 0; ii < iterations; ++ii) {
+        QObject *o = m_component->create(context);
+        QQuickItem *i = qobject_cast<QQuickItem *>(o);
+        if (m_willparent && i)
+            i->setParentItem(m_item);
+        delete o;
+    }
+
+    int e = t.elapsed();
+
+    qWarning() << "Total:" << e << "ms, Per iteration:" << qreal(e) / qreal(iterations) << "ms";
+
+}
+
+void usage(const char *name)
+{
+    qWarning("Usage: %s [-iterations <count>] [-parent] <qml file>\n", name);
+
+    qWarning("qmltime is a tool for benchmarking the runtime cost of instantiating\n"
+    "a QML component. It is typically run as follows:\n"
+    "\n"
+    "%s path/to/benchmark.qml\n"
+    "\n"
+    "If the -parent option is specified, the component being measured will also\n"
+    "be parented to an item already in the scene.\n"
+    "\n"
+    "If the -iterations option is specified, the benchmark will run the specified\n"
+    "number of iterations. If -iterations is not specified, 1024 iterations\n"
+    "are performed.\n"
+    "\n"
+    "qmltime expects the file to be benchmarked to contain a certain structure.\n"
+    "Specifically, it requires the presence of a QmlTime.Timer element. For example,\n"
+    "say we wanted to benchmark the following list delegate:\n"
+    "\n"
+    "Rectangle {\n"
+    "    color: \"green\"\n"
+    "    width: 400; height: 100\n"
+    "    Text {\n"
+    "        anchors.centerIn: parent\n"
+    "        text: name\n"
+    "    }\n"
+    "}\n"
+    "\n"
+    "we would create a benchmark file that looks like this:\n"
+    "\n"
+    "import QtQuick 2.0\n"
+    "import QmlTime 1.0 as QmlTime\n"
+    "\n"
+    "Item {\n"
+    "\n"
+    "    property string name: \"Bob Smith\"\n"
+    "\n"
+    "    QmlTime.Timer {\n"
+    "        component: Rectangle {\n"
+    "            color: \"green\"\n"
+    "            width: 400; height: 100\n"
+    "            Text {\n"
+    "                anchors.centerIn: parent\n"
+    "                text: name\n"
+    "            }\n"
+    "        }\n"
+    "    }\n"
+    "}\n"
+    "\n"
+    "The outer Item functions as a dummy data provider for any additional\n"
+    "data required by the bindings in the component being benchmarked (in the\n"
+    "example above we provide a \"name\" property).\n"
+    "\n"
+    "When started, the component is instantiated once before running\n"
+    "the benchmark, which means that the reported time does not include\n"
+    "compile time (as the results of compilation are cached internally).\n"
+    "In this sense the times reported by qmltime best correspond to the\n"
+    "costs associated with delegate creation in the view classes, where the\n"
+    "same delegate is instantiated over and over. Conversely, it is not a\n"
+    "good approximation for e.g. Loader, which typically only instantiates\n"
+    "an element once (and so for Loader the compile time is very relevant\n"
+    "to the overall cost).", name);
+
+    exit(-1);
+}
+
+int main(int argc, char ** argv)
+{
+    QGuiApplication app(argc, argv);
+
+    qmlRegisterType<Timer>("QmlTime", 1, 0, "Timer");
+
+    uint iterations = 1024;
+    QString filename;
+    bool willParent = false;
+
+    for (int ii = 1; ii < argc; ++ii) {
+        QByteArray arg(argv[ii]);
+
+        if (arg == "-iterations") {
+            if (ii + 1 < argc) {
+                ++ii;
+                QByteArray its(argv[ii]);
+                bool ok = false;
+                iterations = its.toUInt(&ok);
+                if (!ok)
+                    usage(argv[0]);
+            } else {
+                usage(argv[0]);
+            }
+        } else if (arg == "-parent") {
+            willParent = true;
+        } else if (arg == "-help") {
+            usage(argv[0]);
+        } else {
+            filename = QLatin1String(argv[ii]);
+        }
+    }
+
+    if (filename.isEmpty())
+        usage(argv[0]);
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine, filename);
+    if (component.isError()) {
+        qWarning() << component.errors();
+        return -1;
+    }
+
+    QObject *obj = component.create();
+    if (!obj) {
+        qWarning() << component.errors();
+        return -1;
+    }
+
+    Timer *timer = Timer::timerInstance();
+    if (!timer) {
+        qWarning() << "A QmlTime.Timer instance is required.";
+        return -1;
+    }
+
+    timer->setWillParent(willParent);
+
+    if (!timer->component()) {
+        qWarning() << "The timer has no component";
+        return -1;
+    }
+
+    timer->run(iterations);
+
+    return 0;
+}
+
+#include "qmltime.moc"
diff --git a/tools/qmltime/qmltime.pro b/tools/qmltime/qmltime.pro
new file mode 100644
index 0000000000..fa93e91af0
--- /dev/null
+++ b/tools/qmltime/qmltime.pro
@@ -0,0 +1,10 @@
+CONFIG += testcase
+TEMPLATE = app
+TARGET = qmltime
+QT += qml testlib quick
+QT += quick-private
+macx:CONFIG -= app_bundle
+
+SOURCES += qmltime.cpp
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tools/qmltime/tests/anchors/empty.qml b/tools/qmltime/tests/anchors/empty.qml
new file mode 100644
index 0000000000..309b4caa7e
--- /dev/null
+++ b/tools/qmltime/tests/anchors/empty.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+            }
+        }
+    }
+}
+
diff --git a/tools/qmltime/tests/anchors/fill.qml b/tools/qmltime/tests/anchors/fill.qml
new file mode 100644
index 0000000000..df32da66e5
--- /dev/null
+++ b/tools/qmltime/tests/anchors/fill.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+            }
+        }
+    }
+}
+
diff --git a/tools/qmltime/tests/anchors/null.qml b/tools/qmltime/tests/anchors/null.qml
new file mode 100644
index 0000000000..8a1ae0c25d
--- /dev/null
+++ b/tools/qmltime/tests/anchors/null.qml
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                Item {
+                }
+                Item {
+                }
+                Item {
+                }
+                Item {
+                }
+                Item {
+                }
+                Item {
+                }
+                Item {
+                }
+            }
+        }
+    }
+}
+
diff --git a/tools/qmltime/tests/animation/large.qml b/tools/qmltime/tests/animation/large.qml
new file mode 100644
index 0000000000..0c791961dd
--- /dev/null
+++ b/tools/qmltime/tests/animation/large.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            ParallelAnimation {
+                NumberAnimation { duration: 500 }
+                NumberAnimation { duration: 4000; }
+                NumberAnimation { duration: 2000; easing.type: "OutBack"}
+                ColorAnimation { duration: 3000}
+                SequentialAnimation {
+                    PauseAnimation { duration: 1000 }
+                    ScriptAction { script: doSomething(); }
+                    PauseAnimation { duration: 800 }
+                    ScriptAction { script: doSomethingElse(); }
+                    PauseAnimation { duration: 800 }
+                    ParallelAnimation {
+                        NumberAnimation { duration: 200;}
+                        SequentialAnimation {
+                            PauseAnimation { duration: 200}
+                            ParallelAnimation {
+                                NumberAnimation { duration: 300;}
+                                NumberAnimation { duration: 300;}
+                            }
+                            NumberAnimation { from: 0; to: 1; duration: 500 }
+                            PauseAnimation { duration: 200 }
+                            NumberAnimation { from: 1; to: 0; duration: 500 }
+                        }
+                        SequentialAnimation {
+                            PauseAnimation { duration: 150}
+                            NumberAnimation { duration: 300; easing.type: "OutBounce" }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/tools/qmltime/tests/animation/largeNoProps.qml b/tools/qmltime/tests/animation/largeNoProps.qml
new file mode 100644
index 0000000000..734ee46b77
--- /dev/null
+++ b/tools/qmltime/tests/animation/largeNoProps.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            ParallelAnimation {
+                NumberAnimation { }
+                NumberAnimation { }
+                NumberAnimation { }
+                ColorAnimation { }
+                SequentialAnimation {
+                    PauseAnimation { }
+                    ScriptAction { }
+                    PauseAnimation { }
+                    ScriptAction { }
+                    PauseAnimation { }
+                    ParallelAnimation {
+                        NumberAnimation { }
+                        SequentialAnimation {
+                            PauseAnimation { }
+                            ParallelAnimation {
+                                NumberAnimation { }
+                                NumberAnimation { }
+                            }
+                            NumberAnimation { }
+                            PauseAnimation { }
+                            NumberAnimation { }
+                        }
+                        SequentialAnimation {
+                            PauseAnimation { }
+                            NumberAnimation { }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/tools/qmltime/tests/item_creation/children.qml b/tools/qmltime/tests/item_creation/children.qml
new file mode 100644
index 0000000000..87085c1134
--- /dev/null
+++ b/tools/qmltime/tests/item_creation/children.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                children: [
+                    Rectangle { },
+                    Rectangle { },
+                    Item { },
+                    Image { },
+                    Text { },
+                    Item { },
+                    Item { },
+                    Image { },
+                    Image { },
+                    Row { },
+                    Image { },
+                    Image { },
+                    Column { },
+                    Row { },
+                    Text { },
+                    Text { },
+                    Text { },
+                    MouseArea { }
+                ]
+
+            }
+        }
+    }
+
+}
diff --git a/tools/qmltime/tests/item_creation/data.qml b/tools/qmltime/tests/item_creation/data.qml
new file mode 100644
index 0000000000..96804fda40
--- /dev/null
+++ b/tools/qmltime/tests/item_creation/data.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                data: [
+                    Rectangle { },
+                    Rectangle { },
+                    Item { },
+                    Image { },
+                    Text { },
+                    Item { },
+                    Item { },
+                    Image { },
+                    Image { },
+                    Row { },
+                    Image { },
+                    Image { },
+                    Column { },
+                    Row { },
+                    Text { },
+                    Text { },
+                    Text { },
+                    MouseArea { }
+                ]
+
+            }
+        }
+    }
+
+}
diff --git a/tools/qmltime/tests/item_creation/no_creation.qml b/tools/qmltime/tests/item_creation/no_creation.qml
new file mode 100644
index 0000000000..64561eb211
--- /dev/null
+++ b/tools/qmltime/tests/item_creation/no_creation.qml
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+            }
+        }
+    }
+}
diff --git a/tools/qmltime/tests/item_creation/resources.qml b/tools/qmltime/tests/item_creation/resources.qml
new file mode 100644
index 0000000000..c896666b9a
--- /dev/null
+++ b/tools/qmltime/tests/item_creation/resources.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                resources: [
+                    Rectangle { },
+                    Rectangle { },
+                    Item { },
+                    Image { },
+                    Text { },
+                    Item { },
+                    Item { },
+                    Image { },
+                    Image { },
+                    Row { },
+                    Image { },
+                    Image { },
+                    Column { },
+                    Row { },
+                    Text { },
+                    Text { },
+                    Text { },
+                    MouseArea { }
+                ]
+
+            }
+        }
+    }
+
+}
diff --git a/tools/qmltime/tests/loader/Loaded.qml b/tools/qmltime/tests/loader/Loaded.qml
new file mode 100644
index 0000000000..8dedef1361
--- /dev/null
+++ b/tools/qmltime/tests/loader/Loaded.qml
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Item {
+    Rectangle {}
+    Text {}
+    Image {}
+}
diff --git a/tools/qmltime/tests/loader/component_loader.qml b/tools/qmltime/tests/loader/component_loader.qml
new file mode 100644
index 0000000000..9c245aeb21
--- /dev/null
+++ b/tools/qmltime/tests/loader/component_loader.qml
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                Loader {
+                    sourceComponent: Loaded {}
+                }
+            }
+        }
+    }
+}
+
diff --git a/tools/qmltime/tests/loader/empty_loader.qml b/tools/qmltime/tests/loader/empty_loader.qml
new file mode 100644
index 0000000000..9f288f8ad5
--- /dev/null
+++ b/tools/qmltime/tests/loader/empty_loader.qml
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                Loader {}
+                Loaded {}
+            }
+        }
+    }
+}
+
diff --git a/tools/qmltime/tests/loader/no_loader.qml b/tools/qmltime/tests/loader/no_loader.qml
new file mode 100644
index 0000000000..c84b9d3dd6
--- /dev/null
+++ b/tools/qmltime/tests/loader/no_loader.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                Loaded {}
+            }
+        }
+    }
+}
+
diff --git a/tools/qmltime/tests/loader/source_loader.qml b/tools/qmltime/tests/loader/source_loader.qml
new file mode 100644
index 0000000000..41a1792d2c
--- /dev/null
+++ b/tools/qmltime/tests/loader/source_loader.qml
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                Loader {
+                    source: "Loaded.qml"
+                }
+            }
+        }
+    }
+}
+
diff --git a/tools/qmltime/tests/positioner_creation/no_positioner.qml b/tools/qmltime/tests/positioner_creation/no_positioner.qml
new file mode 100644
index 0000000000..09a3fb4321
--- /dev/null
+++ b/tools/qmltime/tests/positioner_creation/no_positioner.qml
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                Rectangle { }
+                Rectangle { }
+                Item {
+                    Image { }
+                    Text { }
+                }
+
+                Item {
+                    Item {
+                        Image { }
+                        Image { }
+                        Item {
+                            Image { }
+                            Image { }
+                        }
+                    }
+
+                    Item {
+                        Item {
+                            Text { }
+                            Text { }
+                        }
+                        Text { }
+                    }
+                }
+                MouseArea { }
+            }
+        }
+    }
+}
diff --git a/tools/qmltime/tests/positioner_creation/null_positioner.qml b/tools/qmltime/tests/positioner_creation/null_positioner.qml
new file mode 100644
index 0000000000..957688bcee
--- /dev/null
+++ b/tools/qmltime/tests/positioner_creation/null_positioner.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                Rectangle { }
+                Rectangle { }
+                Item {
+                    Image { }
+                    Text { }
+                }
+
+                Item {
+                    Item {
+                        Image { }
+                        Image { }
+                        Row { }
+                        Image { }
+                        Image { }
+                    }
+
+                    Column { }
+                    Row { }
+                    Text { }
+                    Text { }
+                    Text { }
+                }
+                MouseArea { }
+            }
+        }
+    }
+}
diff --git a/tools/qmltime/tests/positioner_creation/positioner.qml b/tools/qmltime/tests/positioner_creation/positioner.qml
new file mode 100644
index 0000000000..4e6f08a1fe
--- /dev/null
+++ b/tools/qmltime/tests/positioner_creation/positioner.qml
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+    QmlTime.Timer {
+        component: Component {
+            Item {
+                Rectangle { }
+                Rectangle { }
+                Item {
+                    Image { }
+                    Text { }
+                }
+
+                Item {
+                    Item {
+                        Image { }
+                        Image { }
+                        Row {
+                            Image { }
+                            Image { }
+                        }
+                    }
+
+                    Column {
+                        Row {
+                            Text { }
+                            Text { }
+                        }
+                        Text { }
+                    }
+                }
+                MouseArea { }
+            }
+        }
+    }
+}
diff --git a/tools/qmltime/tests/vmemetaobject/null.qml b/tools/qmltime/tests/vmemetaobject/null.qml
new file mode 100644
index 0000000000..f695c989a3
--- /dev/null
+++ b/tools/qmltime/tests/vmemetaobject/null.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            QtObject {
+            }
+        }
+    }
+
+}
diff --git a/tools/qmltime/tests/vmemetaobject/property.qml b/tools/qmltime/tests/vmemetaobject/property.qml
new file mode 100644
index 0000000000..f0ccabe2f0
--- /dev/null
+++ b/tools/qmltime/tests/vmemetaobject/property.qml
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Component {
+            QtObject {
+                property string s
+                property string s2
+                property string s3
+                property string s4
+            }
+        }
+    }
+
+}
+
diff --git a/tools/qmltime/textingrid.qml b/tools/qmltime/textingrid.qml
new file mode 100644
index 0000000000..69dbdb5dd6
--- /dev/null
+++ b/tools/qmltime/textingrid.qml
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QmlTime 1.0 as QmlTime
+
+Item {
+
+    QmlTime.Timer {
+        component: Grid {
+            width: 480
+            height: width
+
+            id: grid
+            columns: 7
+            rows: 6
+
+            Repeater {
+                model: 42
+                Text {
+                    width: grid.width / grid.columns; height: width
+                    color: "blue"
+                    text: index
+                    font.pixelSize: 15
+                    font.bold: true
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                }
+            }
+
+        }
+    }
+}
+
diff --git a/tools/tools.pro b/tools/tools.pro
index b2e9e27066..96cf80405a 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -12,7 +12,12 @@ qmlimportscanner.CONFIG = host_build
         qmlprofiler \
         qmllint
     qtHaveModule(quick) {
-        !static: SUBDIRS += qmlscene qmlplugindump
+        !static: {
+            SUBDIRS += \
+                qmlscene \
+                qmlplugindump \
+                qmltime
+        }
         qtHaveModule(widgets): SUBDIRS += qmleasing
     }
     qtHaveModule(qmltest): SUBDIRS += qmltestrunner
-- 
cgit v1.2.3


From b4f476cf2353d1dcee1b31891a3644d97fe7f224 Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@viroteck.net>
Date: Fri, 11 Mar 2016 09:46:18 +0100
Subject: qmltime: Remove deprecation define.

Not needed, qmltime uses no deprecated stuff.

Change-Id: I349993b4974857d947ea014bedfc544aaf7c682c
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 tools/qmltime/qmltime.pro | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/qmltime/qmltime.pro b/tools/qmltime/qmltime.pro
index fa93e91af0..80a7073c3c 100644
--- a/tools/qmltime/qmltime.pro
+++ b/tools/qmltime/qmltime.pro
@@ -6,5 +6,3 @@ QT += quick-private
 macx:CONFIG -= app_bundle
 
 SOURCES += qmltime.cpp
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
-- 
cgit v1.2.3


From 1a52f28bdf6e0749461bf01bc0753806e6d77d63 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Wed, 9 Mar 2016 11:12:22 +0100
Subject: Add benchmarks to the "make benchmark" targets that are known to work

The qjsengine benchmark is one exception that is omitted because it crashes currently.

Change-Id: Ic93344dc864d0d6427d85faa12a2753126be808e
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 tests/benchmarks/benchmarks.pro                                    | 5 +++++
 tests/benchmarks/particles/affectors/affectors.pro                 | 2 +-
 tests/benchmarks/particles/emission/emission.pro                   | 2 +-
 tests/benchmarks/qml/animation/animation.pro                       | 2 +-
 tests/benchmarks/qml/binding/binding.pro                           | 2 +-
 tests/benchmarks/qml/compilation/compilation.pro                   | 2 +-
 tests/benchmarks/qml/creation/creation.pro                         | 2 +-
 tests/benchmarks/qml/holistic/holistic.pro                         | 2 +-
 tests/benchmarks/qml/javascript/javascript.pro                     | 2 +-
 tests/benchmarks/qml/js/qjsengine/qjsengine.pro                    | 1 -
 tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro                      | 2 +-
 tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro      | 2 +-
 .../qml/librarymetrics_performance/librarymetrics_performance.pro  | 2 +-
 tests/benchmarks/qml/pointers/pointers.pro                         | 2 +-
 tests/benchmarks/qml/qml.pro                                       | 7 +++----
 tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro               | 2 +-
 tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro             | 2 +-
 tests/benchmarks/qml/qqmlimage/qqmlimage.pro                       | 2 +-
 tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro         | 2 +-
 tests/benchmarks/qml/qquickwindow/qquickwindow.pro                 | 4 ++--
 tests/benchmarks/qml/script/script.pro                             | 2 +-
 tests/benchmarks/qml/typeimports/typeimports.pro                   | 2 +-
 tests/benchmarks/script/qjsvalue/qjsvalue.pro                      | 2 +-
 tests/tests.pro                                                    | 2 +-
 tools/qmltime/qmltime.pro                                          | 3 +--
 25 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 tests/benchmarks/benchmarks.pro

diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
new file mode 100644
index 0000000000..c7e7c6829a
--- /dev/null
+++ b/tests/benchmarks/benchmarks.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+SUBDIRS = qml script
+contains(QT_CONFIG, private_tests) {
+    SUBDIRS += particles
+}
diff --git a/tests/benchmarks/particles/affectors/affectors.pro b/tests/benchmarks/particles/affectors/affectors.pro
index 112c4ea3ec..eb6190a649 100644
--- a/tests/benchmarks/particles/affectors/affectors.pro
+++ b/tests/benchmarks/particles/affectors/affectors.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TARGET = tst_affectors
 SOURCES += tst_affectors.cpp
 macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/particles/emission/emission.pro b/tests/benchmarks/particles/emission/emission.pro
index 0ebd75b738..45a757e2be 100644
--- a/tests/benchmarks/particles/emission/emission.pro
+++ b/tests/benchmarks/particles/emission/emission.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TARGET = tst_emission
 SOURCES += tst_emission.cpp
 macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/qml/animation/animation.pro b/tests/benchmarks/qml/animation/animation.pro
index e089884a7e..4b680ed8fd 100644
--- a/tests/benchmarks/qml/animation/animation.pro
+++ b/tests/benchmarks/qml/animation/animation.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_animation
 QT += qml testlib core-private gui-private qml-private quick-private
diff --git a/tests/benchmarks/qml/binding/binding.pro b/tests/benchmarks/qml/binding/binding.pro
index fc0f731da6..99c0e43ed9 100644
--- a/tests/benchmarks/qml/binding/binding.pro
+++ b/tests/benchmarks/qml/binding/binding.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_binding
 QT += qml testlib
diff --git a/tests/benchmarks/qml/compilation/compilation.pro b/tests/benchmarks/qml/compilation/compilation.pro
index a55864f696..855032d4e2 100644
--- a/tests/benchmarks/qml/compilation/compilation.pro
+++ b/tests/benchmarks/qml/compilation/compilation.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_compilation
 QT += qml qml-private testlib core-private
diff --git a/tests/benchmarks/qml/creation/creation.pro b/tests/benchmarks/qml/creation/creation.pro
index 0cfac64d5f..c6f0bf7e17 100644
--- a/tests/benchmarks/qml/creation/creation.pro
+++ b/tests/benchmarks/qml/creation/creation.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_creation
 QT += core-private gui-private qml-private quick-private widgets testlib
diff --git a/tests/benchmarks/qml/holistic/holistic.pro b/tests/benchmarks/qml/holistic/holistic.pro
index 8fd87c88bd..72ca376523 100644
--- a/tests/benchmarks/qml/holistic/holistic.pro
+++ b/tests/benchmarks/qml/holistic/holistic.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_holistic
 QT += qml network testlib
diff --git a/tests/benchmarks/qml/javascript/javascript.pro b/tests/benchmarks/qml/javascript/javascript.pro
index b8f23f47d5..0ac4983ce0 100644
--- a/tests/benchmarks/qml/javascript/javascript.pro
+++ b/tests/benchmarks/qml/javascript/javascript.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_javascript
 QT += qml testlib
diff --git a/tests/benchmarks/qml/js/qjsengine/qjsengine.pro b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
index f736e59222..e9be784769 100644
--- a/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
+++ b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
@@ -1,4 +1,3 @@
-CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_bench_qjsengine
 
diff --git a/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
index 7b8363b6c4..b86daf2afc 100644
--- a/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
+++ b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_bench_qjsvalue
 
diff --git a/tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro b/tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro
index 34ed9caa15..0eb1dbdc0c 100644
--- a/tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro
+++ b/tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_bench_qjsvalueiterator
 
diff --git a/tests/benchmarks/qml/librarymetrics_performance/librarymetrics_performance.pro b/tests/benchmarks/qml/librarymetrics_performance/librarymetrics_performance.pro
index 7cfa843a2f..3bedc0ea18 100644
--- a/tests/benchmarks/qml/librarymetrics_performance/librarymetrics_performance.pro
+++ b/tests/benchmarks/qml/librarymetrics_performance/librarymetrics_performance.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_librarymetrics_performance
 
diff --git a/tests/benchmarks/qml/pointers/pointers.pro b/tests/benchmarks/qml/pointers/pointers.pro
index ccf85d659a..ee09010c49 100644
--- a/tests/benchmarks/qml/pointers/pointers.pro
+++ b/tests/benchmarks/qml/pointers/pointers.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 QT += core-private qml-private testlib
 TEMPLATE = app
 TARGET = tst_pointers
diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index b80ead6072..53aa68dff3 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -2,7 +2,6 @@ TEMPLATE = subdirs
 
 SUBDIRS += \
            binding \
-           creation \
            compilation \
            javascript \
            holistic \
@@ -11,9 +10,9 @@ SUBDIRS += \
            qqmlimage \
            qqmlmetaproperty \
 #            script \ ### FIXME: doesn't build
-           js \
-           qquickwindow
+           js
 
-qtHaveModule(opengl): SUBDIRS += painting
+qtHaveModule(opengl): SUBDIRS += painting qquickwindow
+qtHaveModule(widgets): SUBDIRS += creation
 
 include(../trusted-benchmarks.pri)
diff --git a/tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro b/tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro
index 12a53f5e20..87f4dccf5c 100644
--- a/tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro
+++ b/tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_qqmlcomponent
 QT += qml testlib
diff --git a/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro b/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
index 4cf6bbe4bc..06371dc1d3 100644
--- a/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
+++ b/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 QT += qml testlib
 TEMPLATE = app
 TARGET = tst_qqmldebugtrace
diff --git a/tests/benchmarks/qml/qqmlimage/qqmlimage.pro b/tests/benchmarks/qml/qqmlimage/qqmlimage.pro
index 6a94052898..dfe0027ab4 100644
--- a/tests/benchmarks/qml/qqmlimage/qqmlimage.pro
+++ b/tests/benchmarks/qml/qqmlimage/qqmlimage.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_qqmlimage
 QT += qml quick-private testlib
diff --git a/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro b/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro
index ce66e1e51f..f69be1bb3b 100644
--- a/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro
+++ b/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_qqmlmetaproperty
 QT += qml testlib
diff --git a/tests/benchmarks/qml/qquickwindow/qquickwindow.pro b/tests/benchmarks/qml/qquickwindow/qquickwindow.pro
index 0676405e23..9e79d4acf8 100644
--- a/tests/benchmarks/qml/qquickwindow/qquickwindow.pro
+++ b/tests/benchmarks/qml/qquickwindow/qquickwindow.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TARGET = tst_qquickwindow
 SOURCES += tst_qquickwindow.cpp
 macx:CONFIG -= app_bundle
@@ -8,4 +8,4 @@ testDataFiles.path = .
 DEPLOYMENT += testDataFiles
 
 QT += core-private gui-private  qml-private quick-private opengl-private testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
\ No newline at end of file
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/qml/script/script.pro b/tests/benchmarks/qml/script/script.pro
index 51a02e796d..c151cdc146 100644
--- a/tests/benchmarks/qml/script/script.pro
+++ b/tests/benchmarks/qml/script/script.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_script
 macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/qml/typeimports/typeimports.pro b/tests/benchmarks/qml/typeimports/typeimports.pro
index b8db7bd134..dd6347e260 100644
--- a/tests/benchmarks/qml/typeimports/typeimports.pro
+++ b/tests/benchmarks/qml/typeimports/typeimports.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_typeimports
 QT += qml testlib
diff --git a/tests/benchmarks/script/qjsvalue/qjsvalue.pro b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
index b0134b085a..166c774f71 100644
--- a/tests/benchmarks/script/qjsvalue/qjsvalue.pro
+++ b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_bench_qjsvalue
 INCLUDEPATH += .
diff --git a/tests/tests.pro b/tests/tests.pro
index 85e4f3a53d..f5731b2f34 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS +=  auto
+SUBDIRS +=  auto benchmarks
diff --git a/tools/qmltime/qmltime.pro b/tools/qmltime/qmltime.pro
index 80a7073c3c..551a43eec1 100644
--- a/tools/qmltime/qmltime.pro
+++ b/tools/qmltime/qmltime.pro
@@ -1,7 +1,6 @@
-CONFIG += testcase
 TEMPLATE = app
 TARGET = qmltime
-QT += qml testlib quick
+QT += qml quick
 QT += quick-private
 macx:CONFIG -= app_bundle
 
-- 
cgit v1.2.3


From 9872999094ce15742c0f98561ca4f51791c8f38d Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Wed, 6 Jan 2016 15:09:00 +0000
Subject: Handle duration of zero in QML animators

Handle a duration of zero in animators using the same approach as
animations.

Task-number: QTBUG-39766
Change-Id: I1628292ad259ec5ec5d3bb0770440efa5fa6dad0
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 src/quick/util/qquickanimatorjob.cpp              | 17 +++++++----
 src/quick/util/qquickanimatorjob_p.h              |  2 ++
 tests/auto/qmltest/animators/tst_zeroduration.qml | 35 +++++++++++++++++++++++
 3 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 tests/auto/qmltest/animators/tst_zeroduration.qml

diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp
index eb627609bf..a6bb69b8ef 100644
--- a/src/quick/util/qquickanimatorjob.cpp
+++ b/src/quick/util/qquickanimatorjob.cpp
@@ -231,6 +231,10 @@ void QQuickAnimatorJob::debugAnimation(QDebug d) const
       << "target:" << m_target << "value:" << m_value;
 }
 
+qreal QQuickAnimatorJob::progress(int time) const
+{
+    return m_easing.valueForProgress((m_duration == 0) ? qreal(1) : qreal(time) / qreal(m_duration));
+}
 qreal QQuickAnimatorJob::value() const
 {
     qreal v;
@@ -381,7 +385,7 @@ void QQuickXAnimatorJob::updateCurrentTime(int time)
         return;
     Q_ASSERT(!m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread());
 
-    m_value = m_from + (m_to - m_from) * m_easing.valueForProgress(time / (qreal) m_duration);
+    m_value = m_from + (m_to - m_from) * progress(time);
     m_helper->dx = m_value;
     m_helper->wasChanged = true;
 }
@@ -398,7 +402,7 @@ void QQuickYAnimatorJob::updateCurrentTime(int time)
         return;
     Q_ASSERT(!m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread());
 
-    m_value = m_from + (m_to - m_from) * m_easing.valueForProgress(time / (qreal) m_duration);
+    m_value = m_from + (m_to - m_from) * progress(time);
     m_helper->dy = m_value;
     m_helper->wasChanged = true;
 }
@@ -468,7 +472,7 @@ void QQuickOpacityAnimatorJob::updateCurrentTime(int time)
         return;
     Q_ASSERT(!m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread());
 
-    m_value = m_from + (m_to - m_from) * m_easing.valueForProgress(time / (qreal) m_duration);
+    m_value = m_from + (m_to - m_from) * progress(time);
     m_opacityNode->setOpacity(m_value);
 }
 
@@ -484,7 +488,7 @@ void QQuickScaleAnimatorJob::updateCurrentTime(int time)
         return;
     Q_ASSERT(!m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread());
 
-    m_value = m_from + (m_to - m_from) * m_easing.valueForProgress(time / (qreal) m_duration);
+    m_value = m_from + (m_to - m_from) * progress(time);
     m_helper->scale = m_value;
     m_helper->wasChanged = true;
 }
@@ -504,7 +508,8 @@ void QQuickRotationAnimatorJob::updateCurrentTime(int time)
         return;
     Q_ASSERT(!m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread());
 
-    float t =  m_easing.valueForProgress(time / (qreal) m_duration);
+    float t = progress(time);
+
     switch (m_direction) {
     case QQuickRotationAnimator::Clockwise:
         m_value = _q_interpolateClockwiseRotation(m_from, m_to, t).toFloat();
@@ -587,7 +592,7 @@ void QQuickUniformAnimatorJob::updateCurrentTime(int time)
     if (!m_node || m_uniformIndex == -1 || m_uniformType == -1)
         return;
 
-    m_value = m_from + (m_to - m_from) * m_easing.valueForProgress(time / (qreal) m_duration);
+    m_value = m_from + (m_to - m_from) * progress(time);
 
     QQuickShaderEffectMaterial *material =
             static_cast<QQuickShaderEffectMaterial *>(m_node->material());
diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h
index 35057d6278..a161df2a36 100644
--- a/src/quick/util/qquickanimatorjob_p.h
+++ b/src/quick/util/qquickanimatorjob_p.h
@@ -152,6 +152,8 @@ protected:
     QQuickAnimatorJob();
     void debugAnimation(QDebug d) const Q_DECL_OVERRIDE;
 
+    qreal progress(int time) const;
+
     QPointer<QQuickItem> m_target;
     QQuickAnimatorController *m_controller;
 
diff --git a/tests/auto/qmltest/animators/tst_zeroduration.qml b/tests/auto/qmltest/animators/tst_zeroduration.qml
new file mode 100644
index 0000000000..83ce235f42
--- /dev/null
+++ b/tests/auto/qmltest/animators/tst_zeroduration.qml
@@ -0,0 +1,35 @@
+import QtQuick 2.2
+import QtTest 1.1
+
+Item {
+    id: root;
+    width: 200
+    height: 200
+
+    TestCase {
+        id: testCase
+        name: "animators-y"
+        when: box.y == 100
+        function test_endresult() {
+            compare(box.yChangeCounter, 1);
+            var image = grabImage(root);
+            verify(image.pixel(0, 100) == Qt.rgba(1, 0, 0));
+            verify(image.pixel(0, 99) == Qt.rgba(1, 1, 1)); // outside on the top
+        }
+    }
+
+    Box {
+        id: box
+
+        anchors.centerIn: undefined
+
+        YAnimator {
+            id: animation
+            target: box
+            from: 0;
+            to: 100
+            duration: 0
+            running: true
+        }
+    }
+}
-- 
cgit v1.2.3


From d30aad9e66e10fc511ce51aaca3b28aa221d1da8 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@theqtcompany.com>
Date: Wed, 23 Mar 2016 12:50:01 +0100
Subject: Use pixel() instead of scanLine() to check the color

For some image formats it is not possible to rely on scanLine() so it is
best to use pixel() for this check as it will take into account the format
of the image correctly.

Change-Id: Iee753b79291f210d243a5aed9d61359c67a78931
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
---
 src/qmltest/quicktestresult.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 57ba65e588..9cecb0e2ff 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -105,9 +105,7 @@ public Q_SLOTS:
          || x * y >= m_image.width() * m_image.height())
             return QVariant();
 
-        const QRgb* pixel = reinterpret_cast<const QRgb*>(m_image.constScanLine(y));
-        pixel += x;
-        return QColor::fromRgba(*pixel);
+        return QColor::fromRgba(m_image.pixel(QPoint(x, y)));
     }
 
     bool equals(QuickTestImageObject *other) const
-- 
cgit v1.2.3


From edab97fdf9e5426e442b40aa4dc09b2d9e21870e Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Wed, 23 Mar 2016 12:49:12 +0100
Subject: Removed the QQmlGuard benchmark

It's not really useful for automated benchmarking and by now most of QQml has
been ported to QPointer.

Change-Id: I4ee34ad481fde9ae9903ad50cba7afd7b6ff7bc5
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 tests/benchmarks/qml/pointers/pointers.pro     |  9 ----
 tests/benchmarks/qml/pointers/tst_pointers.cpp | 69 --------------------------
 tests/benchmarks/qml/qml.pro                   |  1 -
 3 files changed, 79 deletions(-)
 delete mode 100644 tests/benchmarks/qml/pointers/pointers.pro
 delete mode 100644 tests/benchmarks/qml/pointers/tst_pointers.cpp

diff --git a/tests/benchmarks/qml/pointers/pointers.pro b/tests/benchmarks/qml/pointers/pointers.pro
deleted file mode 100644
index ee09010c49..0000000000
--- a/tests/benchmarks/qml/pointers/pointers.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG += benchmark
-QT += core-private qml-private testlib
-TEMPLATE = app
-TARGET = tst_pointers
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_pointers.cpp
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/qml/pointers/tst_pointers.cpp b/tests/benchmarks/qml/pointers/tst_pointers.cpp
deleted file mode 100644
index 8b981f4532..0000000000
--- a/tests/benchmarks/qml/pointers/tst_pointers.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QtQml/private/qqmlguard_p.h>
-#include <QWeakPointer>
-
-class tst_pointers : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_pointers() {}
-
-private slots:
-    void qmlguard();
-    void weakPointer();
-};
-
-void tst_pointers::qmlguard()
-{
-    QObject *obj = new QObject;
-    QBENCHMARK {
-        QQmlGuard<QObject> guardedObject;
-        guardedObject = obj;
-    }
-}
-
-void tst_pointers::weakPointer()
-{
-    QObject *obj = new QObject;
-    QBENCHMARK {
-        QWeakPointer<QObject> guardedObject;
-        guardedObject = obj;
-    }
-}
-
-QTEST_MAIN(tst_pointers)
-#include "tst_pointers.moc"
diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index 53aa68dff3..7969866673 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -5,7 +5,6 @@ SUBDIRS += \
            compilation \
            javascript \
            holistic \
-           pointers \
            qqmlcomponent \
            qqmlimage \
            qqmlmetaproperty \
-- 
cgit v1.2.3


From 5e674480d5d72bc4f8fd132b2351a59d397f67b3 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <stasuku@gmail.com>
Date: Thu, 24 Mar 2016 01:57:44 +0900
Subject: Fix build with -no-gui

Change-Id: I677ab9fce527b5220317d4d30f48d55b7f081e6a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro b/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
index 5d52a8113f..8902490aa0 100644
--- a/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
+++ b/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
@@ -1,5 +1,5 @@
 TARGET = qmldbg_native
-QT += qml-private core-private
+QT = qml-private core-private
 
 SOURCES += \
     $$PWD/qqmlnativedebugconnector.cpp
-- 
cgit v1.2.3


From 89b96d2c6324f229dce9f10b1acba7560dff905d Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Mon, 21 Mar 2016 12:18:47 +0200
Subject: Fix qmlRegisterSingletonType documentation

Change-Id: I36d22343976a2164c396bb17c13526b63ab7579c
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
---
 src/qml/doc/src/qmlfunctions.qdoc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index 4203cca8b3..6fc82eb554 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -365,9 +365,8 @@
    One exception to this is that a QObject singleton type property may not be aliased (because the
    singleton type name does not identify an object within the same component as any other item).
 
-   \b{NOTE:} A QObject singleton type instance returned from a singleton type provider is owned by the QML
-   engine.  For this reason, the singleton type provider function should \b{not} be implemented as a
-   singleton factory.
+   \b{NOTE:} A QObject singleton type instance returned from a singleton type provider is owned by
+   the QML engine unless the object has explicit QQmlEngine::CppOwnership flag set.
 
    Usage:
    \code
-- 
cgit v1.2.3


From ca0765d2835bcb35f34b975a3de84d0f9a64dc51 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@theqtcompany.com>
Date: Mon, 29 Feb 2016 13:36:32 +0100
Subject: Purge sRGB chunks from PNGs in examples.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce

Various tools grumble about sRGB tables in PNG images; and our
handling of them doesn't pay attention to these, so purging them
makes the images smaller with no loss to the images.

Change-Id: If3baf60fb7c0045446ddfddecef96374845e739e
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
---
 examples/qml/dynamicscene/content/images/star.png   | Bin 349 -> 259 bytes
 examples/qml/dynamicscene/content/images/sun.png    | Bin 8153 -> 8110 bytes
 .../imports/TimeExample/hour.png                    | Bin 625 -> 518 bytes
 .../imports/TimeExample/minute.png                  | Bin 625 -> 528 bytes
 examples/quick/animation/basics/images/moon.png     | Bin 2433 -> 2366 bytes
 examples/quick/animation/basics/images/shadow.png   | Bin 425 -> 349 bytes
 examples/quick/animation/basics/images/star.png     | Bin 349 -> 259 bytes
 examples/quick/animation/basics/images/sun.png      | Bin 8153 -> 8110 bytes
 .../customitems/maskedmousearea/images/cloud_1.png  | Bin 49524 -> 49395 bytes
 .../customitems/progressbar/content/background.png  | Bin 426 -> 299 bytes
 .../quick/customitems/searchbox/images/clear.png    | Bin 429 -> 320 bytes
 .../searchbox/images/lineedit-bg-focus.png          | Bin 526 -> 297 bytes
 .../customitems/searchbox/images/lineedit-bg.png    | Bin 426 -> 299 bytes
 .../customitems/spinner/content/spinner-bg.png      | Bin 345 -> 274 bytes
 examples/quick/demos/clocks/content/hour.png        | Bin 625 -> 518 bytes
 examples/quick/demos/clocks/content/minute.png      | Bin 625 -> 528 bytes
 examples/quick/demos/clocks/content/second.png      | Bin 303 -> 231 bytes
 .../PhotoViewerCore/images/box-shadow.png           | Bin 588 -> 371 bytes
 .../photoviewer/PhotoViewerCore/images/busy.png     | Bin 2629 -> 1564 bytes
 .../PhotoViewerCore/images/cardboard.png            | Bin 8844 -> 8477 bytes
 .../demos/rssnews/content/images/btn_close.png      | Bin 1267 -> 328 bytes
 .../quick/demos/rssnews/content/images/busy.png     | Bin 2629 -> 1564 bytes
 .../demos/rssnews/content/images/scrollbar.png      | Bin 161 -> 79 bytes
 .../demos/stocqt/content/images/icon-left-arrow.png | Bin 1368 -> 358 bytes
 examples/quick/imageelements/content/arrow.png      | Bin 404 -> 247 bytes
 examples/quick/imageelements/content/colors.png     | Bin 1655 -> 974 bytes
 examples/quick/imageelements/content/shadow.png     | Bin 588 -> 371 bytes
 .../keyinteraction/focus/Core/images/arrow.png      | Bin 583 -> 411 bytes
 examples/quick/particles/images/colortable.png      | Bin 704 -> 571 bytes
 examples/quick/particles/images/particle2.png       | Bin 3909 -> 1073 bytes
 examples/quick/particles/images/particle3.png       | Bin 3186 -> 574 bytes
 examples/quick/particles/images/particleA.png       | Bin 3541 -> 870 bytes
 examples/quick/particles/images/sizeInOut.png       | Bin 251 -> 132 bytes
 examples/quick/particles/images/starfish_mask.png   | Bin 11301 -> 7403 bytes
 .../quick/particles/itemparticle/content/bubble.png | Bin 3413 -> 2347 bytes
 .../quickwidget/qtquickwidgets-example.png          | Bin 11340 -> 11287 bytes
 examples/quick/shadereffects/content/qt-logo.png    | Bin 13923 -> 9186 bytes
 examples/quick/shared/images/qt-logo.png            | Bin 13923 -> 9186 bytes
 examples/quick/shared/images/tab.png                | Bin 507 -> 309 bytes
 .../quick/text/textselection/pics/endHandle.png     | Bin 185 -> 90 bytes
 .../quick/text/textselection/pics/startHandle.png   | Bin 178 -> 88 bytes
 .../flickable/content/note-yellow.png               | Bin 54559 -> 54283 bytes
 .../multipointtouch/content/Bear0.png               | Bin 15163 -> 14359 bytes
 .../multipointtouch/content/BearB.png               | Bin 18667 -> 16505 bytes
 .../multipointtouch/content/title.png               | Bin 76246 -> 76389 bytes
 .../tutorials/gettingStartedQml/images/arrow.png    | Bin 583 -> 411 bytes
 .../tutorials/samegame/shared/pics/blueStar.png     | Bin 278 -> 149 bytes
 .../tutorials/samegame/shared/pics/greenStar.png    | Bin 273 -> 149 bytes
 .../tutorials/samegame/shared/pics/redStar.png      | Bin 274 -> 148 bytes
 .../quick/views/listview/content/pics/moreDown.png  | Bin 217 -> 91 bytes
 .../quick/views/listview/content/pics/moreUp.png    | Bin 212 -> 91 bytes
 examples/quick/views/parallax/content/hour.png      | Bin 625 -> 518 bytes
 examples/quick/views/parallax/content/minute.png    | Bin 625 -> 528 bytes
 .../quick/views/parallax/content/pics/home-page.png | Bin 3051 -> 2936 bytes
 .../quick/views/parallax/content/pics/shadow.png    | Bin 425 -> 349 bytes
 examples/quick/views/parallax/content/second.png    | Bin 303 -> 231 bytes
 56 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/examples/qml/dynamicscene/content/images/star.png b/examples/qml/dynamicscene/content/images/star.png
index 27ef924267..bdcd36909d 100644
Binary files a/examples/qml/dynamicscene/content/images/star.png and b/examples/qml/dynamicscene/content/images/star.png differ
diff --git a/examples/qml/dynamicscene/content/images/sun.png b/examples/qml/dynamicscene/content/images/sun.png
index 7713ca5ce7..c5fd36ed39 100644
Binary files a/examples/qml/dynamicscene/content/images/sun.png and b/examples/qml/dynamicscene/content/images/sun.png differ
diff --git a/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png b/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png
index f8061a1235..9f33fc5d48 100644
Binary files a/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png and b/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png differ
diff --git a/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png b/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png
index 1297ec7c2b..e2f216c897 100644
Binary files a/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png and b/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png differ
diff --git a/examples/quick/animation/basics/images/moon.png b/examples/quick/animation/basics/images/moon.png
index 9407b2b4f0..1583ac83f7 100644
Binary files a/examples/quick/animation/basics/images/moon.png and b/examples/quick/animation/basics/images/moon.png differ
diff --git a/examples/quick/animation/basics/images/shadow.png b/examples/quick/animation/basics/images/shadow.png
index 8270565e87..2dd494f6c6 100644
Binary files a/examples/quick/animation/basics/images/shadow.png and b/examples/quick/animation/basics/images/shadow.png differ
diff --git a/examples/quick/animation/basics/images/star.png b/examples/quick/animation/basics/images/star.png
index 27ef924267..bdcd36909d 100644
Binary files a/examples/quick/animation/basics/images/star.png and b/examples/quick/animation/basics/images/star.png differ
diff --git a/examples/quick/animation/basics/images/sun.png b/examples/quick/animation/basics/images/sun.png
index 7713ca5ce7..c5fd36ed39 100644
Binary files a/examples/quick/animation/basics/images/sun.png and b/examples/quick/animation/basics/images/sun.png differ
diff --git a/examples/quick/customitems/maskedmousearea/images/cloud_1.png b/examples/quick/customitems/maskedmousearea/images/cloud_1.png
index 87c54af253..9beb7e8442 100644
Binary files a/examples/quick/customitems/maskedmousearea/images/cloud_1.png and b/examples/quick/customitems/maskedmousearea/images/cloud_1.png differ
diff --git a/examples/quick/customitems/progressbar/content/background.png b/examples/quick/customitems/progressbar/content/background.png
index 9044226f85..5c316bc03e 100644
Binary files a/examples/quick/customitems/progressbar/content/background.png and b/examples/quick/customitems/progressbar/content/background.png differ
diff --git a/examples/quick/customitems/searchbox/images/clear.png b/examples/quick/customitems/searchbox/images/clear.png
index 91eb270695..c20a9cfba5 100644
Binary files a/examples/quick/customitems/searchbox/images/clear.png and b/examples/quick/customitems/searchbox/images/clear.png differ
diff --git a/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png b/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png
index bbfac38d2d..c8f2722298 100644
Binary files a/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png and b/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png differ
diff --git a/examples/quick/customitems/searchbox/images/lineedit-bg.png b/examples/quick/customitems/searchbox/images/lineedit-bg.png
index 9044226f85..5c316bc03e 100644
Binary files a/examples/quick/customitems/searchbox/images/lineedit-bg.png and b/examples/quick/customitems/searchbox/images/lineedit-bg.png differ
diff --git a/examples/quick/customitems/spinner/content/spinner-bg.png b/examples/quick/customitems/spinner/content/spinner-bg.png
index b3556f1f9f..da34fc4090 100644
Binary files a/examples/quick/customitems/spinner/content/spinner-bg.png and b/examples/quick/customitems/spinner/content/spinner-bg.png differ
diff --git a/examples/quick/demos/clocks/content/hour.png b/examples/quick/demos/clocks/content/hour.png
index f8061a1235..9f33fc5d48 100644
Binary files a/examples/quick/demos/clocks/content/hour.png and b/examples/quick/demos/clocks/content/hour.png differ
diff --git a/examples/quick/demos/clocks/content/minute.png b/examples/quick/demos/clocks/content/minute.png
index 1297ec7c2b..e2f216c897 100644
Binary files a/examples/quick/demos/clocks/content/minute.png and b/examples/quick/demos/clocks/content/minute.png differ
diff --git a/examples/quick/demos/clocks/content/second.png b/examples/quick/demos/clocks/content/second.png
index 4aa9fb5e8e..d95d99e83d 100644
Binary files a/examples/quick/demos/clocks/content/second.png and b/examples/quick/demos/clocks/content/second.png differ
diff --git a/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png
index 431af8545d..23c011d0ff 100644
Binary files a/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png and b/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png differ
diff --git a/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png
index 664c2b1491..fc65122d26 100644
Binary files a/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png and b/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png differ
diff --git a/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png
index 1847ab528d..a8a9c6079d 100644
Binary files a/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png and b/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png differ
diff --git a/examples/quick/demos/rssnews/content/images/btn_close.png b/examples/quick/demos/rssnews/content/images/btn_close.png
index 6d635375eb..1a3dc44380 100644
Binary files a/examples/quick/demos/rssnews/content/images/btn_close.png and b/examples/quick/demos/rssnews/content/images/btn_close.png differ
diff --git a/examples/quick/demos/rssnews/content/images/busy.png b/examples/quick/demos/rssnews/content/images/busy.png
index 664c2b1491..fc65122d26 100644
Binary files a/examples/quick/demos/rssnews/content/images/busy.png and b/examples/quick/demos/rssnews/content/images/busy.png differ
diff --git a/examples/quick/demos/rssnews/content/images/scrollbar.png b/examples/quick/demos/rssnews/content/images/scrollbar.png
index 0228dcf9eb..c2425dd0df 100644
Binary files a/examples/quick/demos/rssnews/content/images/scrollbar.png and b/examples/quick/demos/rssnews/content/images/scrollbar.png differ
diff --git a/examples/quick/demos/stocqt/content/images/icon-left-arrow.png b/examples/quick/demos/stocqt/content/images/icon-left-arrow.png
index 7868e8ab31..926938cadd 100644
Binary files a/examples/quick/demos/stocqt/content/images/icon-left-arrow.png and b/examples/quick/demos/stocqt/content/images/icon-left-arrow.png differ
diff --git a/examples/quick/imageelements/content/arrow.png b/examples/quick/imageelements/content/arrow.png
index 506ac42fcf..059be6294e 100644
Binary files a/examples/quick/imageelements/content/arrow.png and b/examples/quick/imageelements/content/arrow.png differ
diff --git a/examples/quick/imageelements/content/colors.png b/examples/quick/imageelements/content/colors.png
index dfb62f3d64..57f5aca821 100644
Binary files a/examples/quick/imageelements/content/colors.png and b/examples/quick/imageelements/content/colors.png differ
diff --git a/examples/quick/imageelements/content/shadow.png b/examples/quick/imageelements/content/shadow.png
index 431af8545d..23c011d0ff 100644
Binary files a/examples/quick/imageelements/content/shadow.png and b/examples/quick/imageelements/content/shadow.png differ
diff --git a/examples/quick/keyinteraction/focus/Core/images/arrow.png b/examples/quick/keyinteraction/focus/Core/images/arrow.png
index 14978c2e56..20ee200f5f 100644
Binary files a/examples/quick/keyinteraction/focus/Core/images/arrow.png and b/examples/quick/keyinteraction/focus/Core/images/arrow.png differ
diff --git a/examples/quick/particles/images/colortable.png b/examples/quick/particles/images/colortable.png
index a62ceeb4a0..15509ab5b7 100644
Binary files a/examples/quick/particles/images/colortable.png and b/examples/quick/particles/images/colortable.png differ
diff --git a/examples/quick/particles/images/particle2.png b/examples/quick/particles/images/particle2.png
index 36349c6c6e..4f3372cd07 100644
Binary files a/examples/quick/particles/images/particle2.png and b/examples/quick/particles/images/particle2.png differ
diff --git a/examples/quick/particles/images/particle3.png b/examples/quick/particles/images/particle3.png
index 905d8f37b8..2b04601403 100644
Binary files a/examples/quick/particles/images/particle3.png and b/examples/quick/particles/images/particle3.png differ
diff --git a/examples/quick/particles/images/particleA.png b/examples/quick/particles/images/particleA.png
index c63acdee1f..d86fc9696b 100644
Binary files a/examples/quick/particles/images/particleA.png and b/examples/quick/particles/images/particleA.png differ
diff --git a/examples/quick/particles/images/sizeInOut.png b/examples/quick/particles/images/sizeInOut.png
index 0a306ea21a..43d8862dbe 100644
Binary files a/examples/quick/particles/images/sizeInOut.png and b/examples/quick/particles/images/sizeInOut.png differ
diff --git a/examples/quick/particles/images/starfish_mask.png b/examples/quick/particles/images/starfish_mask.png
index 2ef74f902b..7ae39b34c5 100644
Binary files a/examples/quick/particles/images/starfish_mask.png and b/examples/quick/particles/images/starfish_mask.png differ
diff --git a/examples/quick/particles/itemparticle/content/bubble.png b/examples/quick/particles/itemparticle/content/bubble.png
index c7f479e9e3..f26ed1d3f2 100644
Binary files a/examples/quick/particles/itemparticle/content/bubble.png and b/examples/quick/particles/itemparticle/content/bubble.png differ
diff --git a/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png b/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png
index cc4f52082f..d9e710b7e7 100644
Binary files a/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png and b/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png differ
diff --git a/examples/quick/shadereffects/content/qt-logo.png b/examples/quick/shadereffects/content/qt-logo.png
index 7d3e97eb36..ecbff0ca36 100644
Binary files a/examples/quick/shadereffects/content/qt-logo.png and b/examples/quick/shadereffects/content/qt-logo.png differ
diff --git a/examples/quick/shared/images/qt-logo.png b/examples/quick/shared/images/qt-logo.png
index 7d3e97eb36..ecbff0ca36 100644
Binary files a/examples/quick/shared/images/qt-logo.png and b/examples/quick/shared/images/qt-logo.png differ
diff --git a/examples/quick/shared/images/tab.png b/examples/quick/shared/images/tab.png
index ad8021605f..2ea989b68d 100644
Binary files a/examples/quick/shared/images/tab.png and b/examples/quick/shared/images/tab.png differ
diff --git a/examples/quick/text/textselection/pics/endHandle.png b/examples/quick/text/textselection/pics/endHandle.png
index 1a4bc5d7a0..598cf98857 100644
Binary files a/examples/quick/text/textselection/pics/endHandle.png and b/examples/quick/text/textselection/pics/endHandle.png differ
diff --git a/examples/quick/text/textselection/pics/startHandle.png b/examples/quick/text/textselection/pics/startHandle.png
index deedcd5c91..51def03054 100644
Binary files a/examples/quick/text/textselection/pics/startHandle.png and b/examples/quick/text/textselection/pics/startHandle.png differ
diff --git a/examples/quick/touchinteraction/flickable/content/note-yellow.png b/examples/quick/touchinteraction/flickable/content/note-yellow.png
index 8ddecc8b03..3195952ad2 100644
Binary files a/examples/quick/touchinteraction/flickable/content/note-yellow.png and b/examples/quick/touchinteraction/flickable/content/note-yellow.png differ
diff --git a/examples/quick/touchinteraction/multipointtouch/content/Bear0.png b/examples/quick/touchinteraction/multipointtouch/content/Bear0.png
index 64a02cec8e..f520cc1f1b 100644
Binary files a/examples/quick/touchinteraction/multipointtouch/content/Bear0.png and b/examples/quick/touchinteraction/multipointtouch/content/Bear0.png differ
diff --git a/examples/quick/touchinteraction/multipointtouch/content/BearB.png b/examples/quick/touchinteraction/multipointtouch/content/BearB.png
index c9a84ae1d4..60be2b32c6 100644
Binary files a/examples/quick/touchinteraction/multipointtouch/content/BearB.png and b/examples/quick/touchinteraction/multipointtouch/content/BearB.png differ
diff --git a/examples/quick/touchinteraction/multipointtouch/content/title.png b/examples/quick/touchinteraction/multipointtouch/content/title.png
index c370ee9990..01893a247d 100644
Binary files a/examples/quick/touchinteraction/multipointtouch/content/title.png and b/examples/quick/touchinteraction/multipointtouch/content/title.png differ
diff --git a/examples/quick/tutorials/gettingStartedQml/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/images/arrow.png
index 14978c2e56..20ee200f5f 100644
Binary files a/examples/quick/tutorials/gettingStartedQml/images/arrow.png and b/examples/quick/tutorials/gettingStartedQml/images/arrow.png differ
diff --git a/examples/quick/tutorials/samegame/shared/pics/blueStar.png b/examples/quick/tutorials/samegame/shared/pics/blueStar.png
index ff9588f80a..213bb4bf6c 100644
Binary files a/examples/quick/tutorials/samegame/shared/pics/blueStar.png and b/examples/quick/tutorials/samegame/shared/pics/blueStar.png differ
diff --git a/examples/quick/tutorials/samegame/shared/pics/greenStar.png b/examples/quick/tutorials/samegame/shared/pics/greenStar.png
index cd06854719..38429749b8 100644
Binary files a/examples/quick/tutorials/samegame/shared/pics/greenStar.png and b/examples/quick/tutorials/samegame/shared/pics/greenStar.png differ
diff --git a/examples/quick/tutorials/samegame/shared/pics/redStar.png b/examples/quick/tutorials/samegame/shared/pics/redStar.png
index 0a4dffe583..5cdf45c4c0 100644
Binary files a/examples/quick/tutorials/samegame/shared/pics/redStar.png and b/examples/quick/tutorials/samegame/shared/pics/redStar.png differ
diff --git a/examples/quick/views/listview/content/pics/moreDown.png b/examples/quick/views/listview/content/pics/moreDown.png
index 31a35d5c20..b9061ca322 100644
Binary files a/examples/quick/views/listview/content/pics/moreDown.png and b/examples/quick/views/listview/content/pics/moreDown.png differ
diff --git a/examples/quick/views/listview/content/pics/moreUp.png b/examples/quick/views/listview/content/pics/moreUp.png
index fefb9c9098..5732f241a6 100644
Binary files a/examples/quick/views/listview/content/pics/moreUp.png and b/examples/quick/views/listview/content/pics/moreUp.png differ
diff --git a/examples/quick/views/parallax/content/hour.png b/examples/quick/views/parallax/content/hour.png
index f8061a1235..9f33fc5d48 100644
Binary files a/examples/quick/views/parallax/content/hour.png and b/examples/quick/views/parallax/content/hour.png differ
diff --git a/examples/quick/views/parallax/content/minute.png b/examples/quick/views/parallax/content/minute.png
index 1297ec7c2b..e2f216c897 100644
Binary files a/examples/quick/views/parallax/content/minute.png and b/examples/quick/views/parallax/content/minute.png differ
diff --git a/examples/quick/views/parallax/content/pics/home-page.png b/examples/quick/views/parallax/content/pics/home-page.png
index bd090c3708..01c17b0bbf 100644
Binary files a/examples/quick/views/parallax/content/pics/home-page.png and b/examples/quick/views/parallax/content/pics/home-page.png differ
diff --git a/examples/quick/views/parallax/content/pics/shadow.png b/examples/quick/views/parallax/content/pics/shadow.png
index 8270565e87..2dd494f6c6 100644
Binary files a/examples/quick/views/parallax/content/pics/shadow.png and b/examples/quick/views/parallax/content/pics/shadow.png differ
diff --git a/examples/quick/views/parallax/content/second.png b/examples/quick/views/parallax/content/second.png
index 4aa9fb5e8e..d95d99e83d 100644
Binary files a/examples/quick/views/parallax/content/second.png and b/examples/quick/views/parallax/content/second.png differ
-- 
cgit v1.2.3


From e09034e8bbfe4a130fecf3e9c765c8d38d2bff18 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@theqtcompany.com>
Date: Mon, 29 Feb 2016 14:22:53 +0100
Subject: Purge sRGB chunks from PNG.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Subjects src/particles/particleresources/noise.png to:
pngcrush -ow -brute -rem allb -reduce

Various tools grumble about sRGB tables in PNG images; and our
handling of them doesn't pay attention to these, so purging them
makes the images smaller with no loss to the images.

Change-Id: I534f7c16830912fe0ee17159e50094e490b62b70
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
---
 src/particles/particleresources/noise.png | Bin 19477 -> 13313 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/particles/particleresources/noise.png b/src/particles/particleresources/noise.png
index 3c723e1a5a..c74ce493a6 100644
Binary files a/src/particles/particleresources/noise.png and b/src/particles/particleresources/noise.png differ
-- 
cgit v1.2.3


From fcbe8ba3fafd1f30f08e1e7e694eee4dcb32e1a1 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@theqtcompany.com>
Date: Mon, 29 Feb 2016 14:22:53 +0100
Subject: Purge sRGB chunks from PNG in documentation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce -force

Various tools grumble about sRGB tables in PNG images; and our
handling of them doesn't pay attention to these, so purging them
makes the images smaller with no loss to the images.

Change-Id: I23d7a43ba6c6ce6cafa11c1950a118a73f4d07cd
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
---
 .../scrollbar/doc/images/qml-scrollbar-example.png | Bin 159568 -> 157358 bytes
 .../tabwidget/doc/images/qml-tabwidget-example.png | Bin 5298 -> 4798 bytes
 .../quick/customitems/tabwidget/doc/images/tab.png | Bin 507 -> 309 bytes
 .../doc/images/qtquick-demo-rssnews-small.png      | Bin 56864 -> 56830 bytes
 .../stocqt/doc/images/qtquick-demo-stocqt.png      | Bin 48979 -> 48945 bytes
 .../doc/images/qml-abstractitemmodel-example.png   | Bin 4478 -> 1772 bytes
 .../doc/images/qml-objectlistmodel-example.png     | Bin 1618 -> 1327 bytes
 .../doc/images/qml-stringlistmodel-example.png     | Bin 1612 -> 584 bytes
 .../doc/images/qtquickwidgets-example.png          | Bin 11340 -> 11287 bytes
 src/quick/doc/images/anchorchanges.png             | Bin 566 -> 399 bytes
 src/quick/doc/images/parentchange.png              | Bin 509 -> 357 bytes
 .../doc/images/qml-borderimage-normal-image.png    | Bin 5282 -> 1506 bytes
 src/quick/doc/images/qml-borderimage-scaled.png    | Bin 5580 -> 1552 bytes
 src/quick/doc/images/qml-borderimage-tiled.png     | Bin 5889 -> 1602 bytes
 .../doc/images/qml-item-canvas-clip-complex.png    | Bin 70000 -> 67842 bytes
 .../doc/images/qml-item-canvas-startAngle.png      | Bin 10254 -> 5099 bytes
 src/quick/doc/images/qml-mousearea-snippet.png     | Bin 780 -> 671 bytes
 .../doc/images/qml-photoviewer-demo-small.png      | Bin 35633 -> 35488 bytes
 src/quick/doc/images/qml-rssnews-demo-small.png    | Bin 19489 -> 15717 bytes
 src/quick/doc/images/qmldesigner-visual-editor.png | Bin 102238 -> 101854 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png
index 54adf33daa..2c80421b06 100644
Binary files a/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png and b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png differ
diff --git a/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png
index 847052d301..2e1cae2584 100644
Binary files a/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png and b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png differ
diff --git a/examples/quick/customitems/tabwidget/doc/images/tab.png b/examples/quick/customitems/tabwidget/doc/images/tab.png
index ad8021605f..2ea989b68d 100644
Binary files a/examples/quick/customitems/tabwidget/doc/images/tab.png and b/examples/quick/customitems/tabwidget/doc/images/tab.png differ
diff --git a/examples/quick/demos/rssnews/doc/images/qtquick-demo-rssnews-small.png b/examples/quick/demos/rssnews/doc/images/qtquick-demo-rssnews-small.png
index ffef99ee5c..9d324ceb70 100644
Binary files a/examples/quick/demos/rssnews/doc/images/qtquick-demo-rssnews-small.png and b/examples/quick/demos/rssnews/doc/images/qtquick-demo-rssnews-small.png differ
diff --git a/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png b/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png
index 550c2a8a22..dc09a84dc3 100644
Binary files a/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png and b/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png differ
diff --git a/examples/quick/models/abstractitemmodel/doc/images/qml-abstractitemmodel-example.png b/examples/quick/models/abstractitemmodel/doc/images/qml-abstractitemmodel-example.png
index 1d7ff197ad..4804fd7ccd 100644
Binary files a/examples/quick/models/abstractitemmodel/doc/images/qml-abstractitemmodel-example.png and b/examples/quick/models/abstractitemmodel/doc/images/qml-abstractitemmodel-example.png differ
diff --git a/examples/quick/models/objectlistmodel/doc/images/qml-objectlistmodel-example.png b/examples/quick/models/objectlistmodel/doc/images/qml-objectlistmodel-example.png
index c0fc490c75..416e08a857 100644
Binary files a/examples/quick/models/objectlistmodel/doc/images/qml-objectlistmodel-example.png and b/examples/quick/models/objectlistmodel/doc/images/qml-objectlistmodel-example.png differ
diff --git a/examples/quick/models/stringlistmodel/doc/images/qml-stringlistmodel-example.png b/examples/quick/models/stringlistmodel/doc/images/qml-stringlistmodel-example.png
index c8c888b620..de632806b1 100644
Binary files a/examples/quick/models/stringlistmodel/doc/images/qml-stringlistmodel-example.png and b/examples/quick/models/stringlistmodel/doc/images/qml-stringlistmodel-example.png differ
diff --git a/examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png b/examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png
index cc4f52082f..d9e710b7e7 100644
Binary files a/examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png and b/examples/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png differ
diff --git a/src/quick/doc/images/anchorchanges.png b/src/quick/doc/images/anchorchanges.png
index 4973e4e9aa..12d99393b6 100644
Binary files a/src/quick/doc/images/anchorchanges.png and b/src/quick/doc/images/anchorchanges.png differ
diff --git a/src/quick/doc/images/parentchange.png b/src/quick/doc/images/parentchange.png
index 93206fbbb2..05f78eac34 100644
Binary files a/src/quick/doc/images/parentchange.png and b/src/quick/doc/images/parentchange.png differ
diff --git a/src/quick/doc/images/qml-borderimage-normal-image.png b/src/quick/doc/images/qml-borderimage-normal-image.png
index ae7460a7d7..fd0dd37c82 100644
Binary files a/src/quick/doc/images/qml-borderimage-normal-image.png and b/src/quick/doc/images/qml-borderimage-normal-image.png differ
diff --git a/src/quick/doc/images/qml-borderimage-scaled.png b/src/quick/doc/images/qml-borderimage-scaled.png
index 8035c79f37..e42891ecc7 100644
Binary files a/src/quick/doc/images/qml-borderimage-scaled.png and b/src/quick/doc/images/qml-borderimage-scaled.png differ
diff --git a/src/quick/doc/images/qml-borderimage-tiled.png b/src/quick/doc/images/qml-borderimage-tiled.png
index 14883d0dd6..e27d9601c4 100644
Binary files a/src/quick/doc/images/qml-borderimage-tiled.png and b/src/quick/doc/images/qml-borderimage-tiled.png differ
diff --git a/src/quick/doc/images/qml-item-canvas-clip-complex.png b/src/quick/doc/images/qml-item-canvas-clip-complex.png
index cb582bad41..92730ff2e0 100644
Binary files a/src/quick/doc/images/qml-item-canvas-clip-complex.png and b/src/quick/doc/images/qml-item-canvas-clip-complex.png differ
diff --git a/src/quick/doc/images/qml-item-canvas-startAngle.png b/src/quick/doc/images/qml-item-canvas-startAngle.png
index f81562e5e4..bf82c3aa4b 100644
Binary files a/src/quick/doc/images/qml-item-canvas-startAngle.png and b/src/quick/doc/images/qml-item-canvas-startAngle.png differ
diff --git a/src/quick/doc/images/qml-mousearea-snippet.png b/src/quick/doc/images/qml-mousearea-snippet.png
index 15229446c7..d1ddd8d2f5 100644
Binary files a/src/quick/doc/images/qml-mousearea-snippet.png and b/src/quick/doc/images/qml-mousearea-snippet.png differ
diff --git a/src/quick/doc/images/qml-photoviewer-demo-small.png b/src/quick/doc/images/qml-photoviewer-demo-small.png
index b16fb4e53a..ada37794ae 100644
Binary files a/src/quick/doc/images/qml-photoviewer-demo-small.png and b/src/quick/doc/images/qml-photoviewer-demo-small.png differ
diff --git a/src/quick/doc/images/qml-rssnews-demo-small.png b/src/quick/doc/images/qml-rssnews-demo-small.png
index 451a420623..299f72adc5 100644
Binary files a/src/quick/doc/images/qml-rssnews-demo-small.png and b/src/quick/doc/images/qml-rssnews-demo-small.png differ
diff --git a/src/quick/doc/images/qmldesigner-visual-editor.png b/src/quick/doc/images/qmldesigner-visual-editor.png
index 9cd4b8b2dc..94f8239ed4 100644
Binary files a/src/quick/doc/images/qmldesigner-visual-editor.png and b/src/quick/doc/images/qmldesigner-visual-editor.png differ
-- 
cgit v1.2.3


From fe10cee6265f068bf0da03895c0c7c5680dc36a5 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Tue, 22 Mar 2016 10:46:10 +0100
Subject: Fix Image.Pad on high DPI

Take device pixel ratio into account (pixWidth and pixHeight are scaled)
while calculating source and target rects for QQuickImage::Pad.

Change-Id: I4a8b4fc305d0af93921bca900c683927d6bfd0e3
Task-number: QTBUG-52043
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 src/quick/items/qquickimage.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 20f4551af9..1e28af03c6 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -691,17 +691,17 @@ QSGNode *QQuickImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
         break;
 
     case Pad:
-        qreal w = qMin(qreal(d->pix.width()), width());
-        qreal h = qMin(qreal(d->pix.height()), height());
-        qreal x = (d->pix.width() > width()) ? -xOffset : 0;
-        qreal y = (d->pix.height() > height()) ? -yOffset : 0;
+        qreal w = qMin(qreal(pixWidth), width());
+        qreal h = qMin(qreal(pixHeight), height());
+        qreal x = (pixWidth > width()) ? -xOffset : 0;
+        qreal y = (pixHeight > height()) ? -yOffset : 0;
         targetRect = QRectF(x + xOffset, y + yOffset, w, h);
         sourceRect = QRectF(x, y, w, h);
         break;
     };
 
-    qreal nsWidth = (hWrap == QSGTexture::Repeat) ? d->pix.width() / d->devicePixelRatio : d->pix.width();
-    qreal nsHeight = (vWrap == QSGTexture::Repeat) ? d->pix.height() / d->devicePixelRatio : d->pix.height();
+    qreal nsWidth = (hWrap == QSGTexture::Repeat || d->fillMode == Pad) ? d->pix.width() / d->devicePixelRatio : d->pix.width();
+    qreal nsHeight = (vWrap == QSGTexture::Repeat || d->fillMode == Pad) ? d->pix.height() / d->devicePixelRatio : d->pix.height();
     QRectF nsrect(sourceRect.x() / nsWidth,
                   sourceRect.y() / nsHeight,
                   sourceRect.width() / nsWidth,
-- 
cgit v1.2.3


From 7d8c941574114ff0ce3f12793bc9c9356577fc0e Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Date: Wed, 23 Mar 2016 10:55:31 +0100
Subject: Remove empty .pro file

Change-Id: Ia85ced87b9cb0ad2093bdfc4abcf222929bc8bd5
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
---
 tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.pro | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.pro

diff --git a/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.pro b/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.pro
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.3


From 7d7e28ce112c2e3af5542dc1b025627340a5ba2d Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@theqtcompany.com>
Date: Mon, 29 Feb 2016 14:22:53 +0100
Subject: Purge sRGB chunks from PNG in tests.

Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce

Various tools grumble about sRGB tables in PNG images; and our
handling of them doesn't pay attention to these, so purging them
makes the images smaller with no loss to the images.

Change-Id: I9e4dc3aec97cd32bc8ac216fadeaf7669c49647c
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 tests/auto/particles/shared/table.png               | Bin 704 -> 571 bytes
 .../qqmlprofilerservice/data/TestImage_2x2.png      | Bin 158 -> 67 bytes
 tests/auto/qmltest/borderimage/colors.png           | Bin 1655 -> 974 bytes
 tests/auto/quick/qquickanimatedimage/data/green.png | Bin 314 -> 201 bytes
 tests/auto/quick/qquickborderimage/data/colors.png  | Bin 1655 -> 974 bytes
 tests/auto/quick/qquickimage/data/colors.png        | Bin 1655 -> 974 bytes
 tests/auto/quick/qquickimage/data/colors1.png       | Bin 1655 -> 974 bytes
 tests/auto/quick/qquickimage/data/green.png         | Bin 314 -> 201 bytes
 tests/auto/quick/qquickimage/data/rect.png          | Bin 171 -> 98 bytes
 tests/auto/quick/qquickpixmapcache/data/massive.png | Bin 31834 -> 11468 bytes
 tests/auto/quick/qquickstates/data/image.png        | Bin 173 -> 82 bytes
 tests/auto/quick/qquickwindow/data/colors.png       | Bin 1655 -> 974 bytes
 .../qml/librarymetrics_performance/data/green.png   | Bin 314 -> 201 bytes
 tests/benchmarks/qml/painting/data/63x63.png        | Bin 3077 -> 2621 bytes
 tests/benchmarks/qml/painting/data/63x63_opaque.png | Bin 3440 -> 2763 bytes
 tests/benchmarks/qml/painting/data/64x64.png        | Bin 3101 -> 2622 bytes
 tests/benchmarks/qml/painting/data/64x64_opaque.png | Bin 3588 -> 2915 bytes
 tests/manual/highdpi/BorderImage.png                | Bin 9420 -> 5251 bytes
 .../scenegraph_lancelot/data/shared/blue_72x96.png  | Bin 20990 -> 168 bytes
 .../scenegraph_lancelot/data/shared/cyan_72x96.png  | Bin 20990 -> 168 bytes
 .../scenegraph_lancelot/data/shared/green_72x96.png | Bin 20990 -> 168 bytes
 .../data/shared/orange_72x96.png                    | Bin 20990 -> 169 bytes
 .../scenegraph_lancelot/data/shared/red_72x96.png   | Bin 20990 -> 167 bytes
 .../scenegraph_lancelot/data/shared/sample_1.png    | Bin 28405 -> 27787 bytes
 .../manual/scenegraph_lancelot/data/shared/tile.png | Bin 189 -> 88 bytes
 .../data/shared/uniquepixels.png                    | Bin 210 -> 117 bytes
 .../data/shared/violet_72x96.png                    | Bin 20990 -> 169 bytes
 .../data/shared/yellow_72x96.png                    | Bin 20990 -> 168 bytes
 .../elements/content/pics/logo-hollowed.png         | Bin 637 -> 563 bytes
 .../elements/content/pics/qml-borderimage.png       | Bin 5580 -> 1552 bytes
 30 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/auto/particles/shared/table.png b/tests/auto/particles/shared/table.png
index a62ceeb4a0..15509ab5b7 100644
Binary files a/tests/auto/particles/shared/table.png and b/tests/auto/particles/shared/table.png differ
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/TestImage_2x2.png b/tests/auto/qml/debugger/qqmlprofilerservice/data/TestImage_2x2.png
index 30228cbbdc..b54163f926 100644
Binary files a/tests/auto/qml/debugger/qqmlprofilerservice/data/TestImage_2x2.png and b/tests/auto/qml/debugger/qqmlprofilerservice/data/TestImage_2x2.png differ
diff --git a/tests/auto/qmltest/borderimage/colors.png b/tests/auto/qmltest/borderimage/colors.png
index dfb62f3d64..57f5aca821 100644
Binary files a/tests/auto/qmltest/borderimage/colors.png and b/tests/auto/qmltest/borderimage/colors.png differ
diff --git a/tests/auto/quick/qquickanimatedimage/data/green.png b/tests/auto/quick/qquickanimatedimage/data/green.png
index 0a2e153ba1..4718c00e62 100644
Binary files a/tests/auto/quick/qquickanimatedimage/data/green.png and b/tests/auto/quick/qquickanimatedimage/data/green.png differ
diff --git a/tests/auto/quick/qquickborderimage/data/colors.png b/tests/auto/quick/qquickborderimage/data/colors.png
index dfb62f3d64..57f5aca821 100644
Binary files a/tests/auto/quick/qquickborderimage/data/colors.png and b/tests/auto/quick/qquickborderimage/data/colors.png differ
diff --git a/tests/auto/quick/qquickimage/data/colors.png b/tests/auto/quick/qquickimage/data/colors.png
index dfb62f3d64..57f5aca821 100644
Binary files a/tests/auto/quick/qquickimage/data/colors.png and b/tests/auto/quick/qquickimage/data/colors.png differ
diff --git a/tests/auto/quick/qquickimage/data/colors1.png b/tests/auto/quick/qquickimage/data/colors1.png
index dfb62f3d64..57f5aca821 100644
Binary files a/tests/auto/quick/qquickimage/data/colors1.png and b/tests/auto/quick/qquickimage/data/colors1.png differ
diff --git a/tests/auto/quick/qquickimage/data/green.png b/tests/auto/quick/qquickimage/data/green.png
index 0a2e153ba1..4718c00e62 100644
Binary files a/tests/auto/quick/qquickimage/data/green.png and b/tests/auto/quick/qquickimage/data/green.png differ
diff --git a/tests/auto/quick/qquickimage/data/rect.png b/tests/auto/quick/qquickimage/data/rect.png
index d564a2d5a5..fe839a40e4 100644
Binary files a/tests/auto/quick/qquickimage/data/rect.png and b/tests/auto/quick/qquickimage/data/rect.png differ
diff --git a/tests/auto/quick/qquickpixmapcache/data/massive.png b/tests/auto/quick/qquickpixmapcache/data/massive.png
index bc6cc9e6ca..9a3e0e112f 100644
Binary files a/tests/auto/quick/qquickpixmapcache/data/massive.png and b/tests/auto/quick/qquickpixmapcache/data/massive.png differ
diff --git a/tests/auto/quick/qquickstates/data/image.png b/tests/auto/quick/qquickstates/data/image.png
index ed1833c95b..0e681ba1e1 100644
Binary files a/tests/auto/quick/qquickstates/data/image.png and b/tests/auto/quick/qquickstates/data/image.png differ
diff --git a/tests/auto/quick/qquickwindow/data/colors.png b/tests/auto/quick/qquickwindow/data/colors.png
index dfb62f3d64..57f5aca821 100644
Binary files a/tests/auto/quick/qquickwindow/data/colors.png and b/tests/auto/quick/qquickwindow/data/colors.png differ
diff --git a/tests/benchmarks/qml/librarymetrics_performance/data/green.png b/tests/benchmarks/qml/librarymetrics_performance/data/green.png
index 0a2e153ba1..4718c00e62 100644
Binary files a/tests/benchmarks/qml/librarymetrics_performance/data/green.png and b/tests/benchmarks/qml/librarymetrics_performance/data/green.png differ
diff --git a/tests/benchmarks/qml/painting/data/63x63.png b/tests/benchmarks/qml/painting/data/63x63.png
index d9efda8a7a..4480496818 100644
Binary files a/tests/benchmarks/qml/painting/data/63x63.png and b/tests/benchmarks/qml/painting/data/63x63.png differ
diff --git a/tests/benchmarks/qml/painting/data/63x63_opaque.png b/tests/benchmarks/qml/painting/data/63x63_opaque.png
index d1429080db..dbe96edb35 100644
Binary files a/tests/benchmarks/qml/painting/data/63x63_opaque.png and b/tests/benchmarks/qml/painting/data/63x63_opaque.png differ
diff --git a/tests/benchmarks/qml/painting/data/64x64.png b/tests/benchmarks/qml/painting/data/64x64.png
index b149f33c3d..c718728a44 100644
Binary files a/tests/benchmarks/qml/painting/data/64x64.png and b/tests/benchmarks/qml/painting/data/64x64.png differ
diff --git a/tests/benchmarks/qml/painting/data/64x64_opaque.png b/tests/benchmarks/qml/painting/data/64x64_opaque.png
index 94c07f3b3e..73e816465d 100644
Binary files a/tests/benchmarks/qml/painting/data/64x64_opaque.png and b/tests/benchmarks/qml/painting/data/64x64_opaque.png differ
diff --git a/tests/manual/highdpi/BorderImage.png b/tests/manual/highdpi/BorderImage.png
index 8fa6b40d78..d93f03e80f 100644
Binary files a/tests/manual/highdpi/BorderImage.png and b/tests/manual/highdpi/BorderImage.png differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/blue_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/blue_72x96.png
index b9e584d8bd..ceddd09b4e 100644
Binary files a/tests/manual/scenegraph_lancelot/data/shared/blue_72x96.png and b/tests/manual/scenegraph_lancelot/data/shared/blue_72x96.png differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/cyan_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/cyan_72x96.png
index c1ae9f3eee..b465fa9a62 100644
Binary files a/tests/manual/scenegraph_lancelot/data/shared/cyan_72x96.png and b/tests/manual/scenegraph_lancelot/data/shared/cyan_72x96.png differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/green_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/green_72x96.png
index 2ddadde72c..9637f71b74 100644
Binary files a/tests/manual/scenegraph_lancelot/data/shared/green_72x96.png and b/tests/manual/scenegraph_lancelot/data/shared/green_72x96.png differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/orange_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/orange_72x96.png
index 2b0f0c961c..1b2c40ae0a 100644
Binary files a/tests/manual/scenegraph_lancelot/data/shared/orange_72x96.png and b/tests/manual/scenegraph_lancelot/data/shared/orange_72x96.png differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/red_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/red_72x96.png
index db015768d7..019e5584de 100644
Binary files a/tests/manual/scenegraph_lancelot/data/shared/red_72x96.png and b/tests/manual/scenegraph_lancelot/data/shared/red_72x96.png differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/sample_1.png b/tests/manual/scenegraph_lancelot/data/shared/sample_1.png
index 24d02f4c22..d4dd62f254 100644
Binary files a/tests/manual/scenegraph_lancelot/data/shared/sample_1.png and b/tests/manual/scenegraph_lancelot/data/shared/sample_1.png differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/tile.png b/tests/manual/scenegraph_lancelot/data/shared/tile.png
index 1c54278442..67e21ad80c 100644
Binary files a/tests/manual/scenegraph_lancelot/data/shared/tile.png and b/tests/manual/scenegraph_lancelot/data/shared/tile.png differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/uniquepixels.png b/tests/manual/scenegraph_lancelot/data/shared/uniquepixels.png
index af240b09c3..83b0f7dbbf 100644
Binary files a/tests/manual/scenegraph_lancelot/data/shared/uniquepixels.png and b/tests/manual/scenegraph_lancelot/data/shared/uniquepixels.png differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/violet_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/violet_72x96.png
index d8ecf51756..382e7eca72 100644
Binary files a/tests/manual/scenegraph_lancelot/data/shared/violet_72x96.png and b/tests/manual/scenegraph_lancelot/data/shared/violet_72x96.png differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/yellow_72x96.png b/tests/manual/scenegraph_lancelot/data/shared/yellow_72x96.png
index 569b6c1dd7..8f60703a4e 100644
Binary files a/tests/manual/scenegraph_lancelot/data/shared/yellow_72x96.png and b/tests/manual/scenegraph_lancelot/data/shared/yellow_72x96.png differ
diff --git a/tests/testapplications/elements/content/pics/logo-hollowed.png b/tests/testapplications/elements/content/pics/logo-hollowed.png
index ca2acb3651..bff0eea9de 100644
Binary files a/tests/testapplications/elements/content/pics/logo-hollowed.png and b/tests/testapplications/elements/content/pics/logo-hollowed.png differ
diff --git a/tests/testapplications/elements/content/pics/qml-borderimage.png b/tests/testapplications/elements/content/pics/qml-borderimage.png
index 8035c79f37..e42891ecc7 100644
Binary files a/tests/testapplications/elements/content/pics/qml-borderimage.png and b/tests/testapplications/elements/content/pics/qml-borderimage.png differ
-- 
cgit v1.2.3


From cef27bf90cbb8d4e6f36f6b77fa5efb361e01ad2 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <albert.astals@canonical.com>
Date: Tue, 29 Mar 2016 14:40:23 +0200
Subject: Fix crash in hasAtlasTexture

Check for the QSGTextureProvider not being 0 before asking for its texture,
we are doing the same in the loop of QQuickShaderEffectMaterial::compare so
it was forgotten to do it here.

Valgrind trace of the crash i get without it
==26317== Invalid read of size 8
==26317==    at 0x652B73A: hasAtlasTexture(QVector<QSGTextureProvider*> const&) (qquickshadereffectnode.cpp:49)
==26317==    by 0x652BABC: QQuickShaderEffectMaterial::compare(QSGMaterial const*) const (qquickshadereffectnode.cpp:396)
==26317==    by 0x63D1BF6: QSGBatchRenderer::Renderer::prepareOpaqueBatches() (qsgbatchrenderer.cpp:1525)
==26317==    by 0x63DE7A7: QSGBatchRenderer::Renderer::render() (qsgbatchrenderer.cpp:2611)
==26317==    by 0x63E9D3E: QSGRenderer::renderScene(QSGBindable const&) (qsgrenderer.cpp:208)
==26317==    by 0x63EA58A: QSGRenderer::renderScene(unsigned int) (qsgrenderer.cpp:168)
==26317==    by 0x63FAA7D: QSGRenderContext::renderNextFrame(QSGRenderer*, unsigned int) (qsgcontext.cpp:558)
==26317==    by 0x644540A: QQuickWindowPrivate::renderSceneGraph(QSize const&) (qquickwindow.cpp:383)
==26317==    by 0x641541A: QSGGuiThreadRenderLoop::renderWindow(QQuickWindow*) (qsgrenderloop.cpp:378)
==26317==    by 0x6416520: QSGGuiThreadRenderLoop::event(QEvent*) (qsgrenderloop.cpp:474)
==26317==    by 0x605F488: QCoreApplication::notify(QObject*, QEvent*) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.5.1)
==26317==    by 0x605F5BA: QCoreApplication::notifyInternal(QObject*, QEvent*) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.5.1)
==26317==  Address 0x0 is not stack'd, malloc'd or (recently) free'd

Change-Id: I3b07450438d98910fbbff9f8b7a3d9d851ed4e5d
Reviewed-by: Michael Brasser <michael.brasser@live.com>
---
 src/quick/items/qquickshadereffectnode.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index 954aa6c67b..95537fdefc 100644
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -46,7 +46,7 @@ static bool hasAtlasTexture(const QVector<QSGTextureProvider *> &textureProvider
 {
     for (int i = 0; i < textureProviders.size(); ++i) {
         QSGTextureProvider *t = textureProviders.at(i);
-        if (t->texture() && t->texture()->isAtlasTexture())
+        if (t && t->texture() && t->texture()->isAtlasTexture())
             return true;
     }
     return false;
-- 
cgit v1.2.3


From 3fb0f3fc8311b1e1d85e6f56d8d9cbc5c0be99b7 Mon Sep 17 00:00:00 2001
From: Vladimir Moolle <vmoolle@ics.com>
Date: Thu, 31 Mar 2016 23:13:10 +0300
Subject: Documentation: fix vector3danimation property type names.

Was real instead of vector3d.

Task-number: QTBUG-52213
Change-Id: Ib8d9bb39b51277c6f63d2b5c45433542a127149d
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
---
 src/quick/util/qquickanimation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 22bfd7aef1..f39f666587 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -1435,7 +1435,7 @@ QQuickVector3dAnimation::~QQuickVector3dAnimation()
 }
 
 /*!
-    \qmlproperty real QtQuick::Vector3dAnimation::from
+    \qmlproperty vector3d QtQuick::Vector3dAnimation::from
     This property holds the starting value for the animation.
 
     If the Vector3dAnimation is defined within a \l Transition or \l Behavior,
@@ -1457,7 +1457,7 @@ void QQuickVector3dAnimation::setFrom(QVector3D f)
 }
 
 /*!
-    \qmlproperty real QtQuick::Vector3dAnimation::to
+    \qmlproperty vector3d QtQuick::Vector3dAnimation::to
     This property holds the end value for the animation.
 
     If the Vector3dAnimation is defined within a \l Transition or \l Behavior,
-- 
cgit v1.2.3


From 886662d409f6422bc43df500314470f776958bfd Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <albert.astals@canonical.com>
Date: Thu, 31 Mar 2016 17:42:43 +0200
Subject: Give a nicer error if the passed item doesn't exist

Instead of
  Cannot read property 'width' of null
and a line pointing to TestCase.qml, you get
  No item given to mouseWheel
and a line pointing to the offending code

Change-Id: I8e035878035cb836a4c0c33a772ad4353d8dd000
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
---
 src/imports/testlib/TestCase.qml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index 8bedad40e9..c736a1a93a 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -966,6 +966,9 @@ Item {
         \sa mouseRelease(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel()
     */
     function mousePress(item, x, y, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mousePress", 1)
+
         if (button === undefined)
             button = Qt.LeftButton
         if (modifiers === undefined)
@@ -997,6 +1000,9 @@ Item {
         \sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel()
     */
     function mouseRelease(item, x, y, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseRelease", 1)
+
         if (button === undefined)
             button = Qt.LeftButton
         if (modifiers === undefined)
@@ -1030,6 +1036,9 @@ Item {
         \sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseRelease(), mouseWheel()
     */
     function mouseDrag(item, x, y, dx, dy, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseDrag", 1)
+
         if (item.x === undefined || item.y === undefined)
             return
         if (button === undefined)
@@ -1077,6 +1086,9 @@ Item {
         \sa mousePress(), mouseRelease(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel()
     */
     function mouseClick(item, x, y, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseClick", 1)
+
         if (button === undefined)
             button = Qt.LeftButton
         if (modifiers === undefined)
@@ -1108,6 +1120,9 @@ Item {
         \sa mouseDoubleClickSequence(), mousePress(), mouseRelease(), mouseClick(), mouseMove(), mouseDrag(), mouseWheel()
     */
     function mouseDoubleClick(item, x, y, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseDoubleClick", 1)
+
         if (button === undefined)
             button = Qt.LeftButton
         if (modifiers === undefined)
@@ -1146,6 +1161,9 @@ Item {
         \sa mouseDoubleClick(), mousePress(), mouseRelease(), mouseClick(), mouseMove(), mouseDrag(), mouseWheel()
     */
     function mouseDoubleClickSequence(item, x, y, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseDoubleClickSequence", 1)
+
         if (button === undefined)
             button = Qt.LeftButton
         if (modifiers === undefined)
@@ -1175,6 +1193,9 @@ Item {
         \sa mousePress(), mouseRelease(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseDrag(), mouseWheel()
     */
     function mouseMove(item, x, y, delay, buttons) {
+        if (!item)
+            qtest_fail("No item given to mouseMove", 1)
+
         if (delay == undefined)
             delay = -1
         if (buttons == undefined)
@@ -1200,6 +1221,9 @@ Item {
         \sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseRelease(), mouseDrag(), QWheelEvent::angleDelta()
     */
     function mouseWheel(item, x, y, xDelta, yDelta, buttons, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseWheel", 1)
+
         if (delay == undefined)
             delay = -1
         if (buttons == undefined)
-- 
cgit v1.2.3


From 07f2ce1827243a61f763801200987ddc85fb817b Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Tue, 29 Mar 2016 21:56:46 +0200
Subject: Move Qt Quick resources under the :/qt-project.org/ directory

Change-Id: I7c7745264ff66b7db042e19f6d44124fa78bb86c
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
 src/quick/items/items.qrc                  | 2 +-
 src/quick/items/qquickanimatedsprite.cpp   | 4 ++--
 src/quick/items/qquickshadereffect.cpp     | 4 ++--
 src/quick/items/qquickshadereffectnode.cpp | 4 ++--
 src/quick/items/qquickspritesequence.cpp   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/quick/items/items.qrc b/src/quick/items/items.qrc
index 671d8acdbb..99f9b5224f 100644
--- a/src/quick/items/items.qrc
+++ b/src/quick/items/items.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/items">
+    <qresource prefix="/qt-project.org/items">
         <file>shaders/sprite.frag</file>
         <file>shaders/sprite.vert</file>
         <file>shaders/shadereffect.vert</file>
diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index d7f3f4f83b..44b5ff1e45 100644
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -96,8 +96,8 @@ public:
     AnimatedSpriteMaterialData()
         : QSGMaterialShader()
     {
-        setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/items/shaders/sprite.vert"));
-        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/items/shaders/sprite.frag"));
+        setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/items/shaders/sprite.vert"));
+        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/items/shaders/sprite.frag"));
     }
 
     void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *) Q_DECL_OVERRIDE
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index 6cb9216955..47c67e0e1c 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -1027,12 +1027,12 @@ QSGNode *QQuickShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa
         Key s = m_common.source;
         QSGShaderSourceBuilder builder;
         if (s.sourceCode[Key::FragmentShader].isEmpty()) {
-            builder.appendSourceFile(QStringLiteral(":/items/shaders/shadereffect.frag"));
+            builder.appendSourceFile(QStringLiteral(":/qt-project.org/items/shaders/shadereffect.frag"));
             s.sourceCode[Key::FragmentShader] = builder.source();
             builder.clear();
         }
         if (s.sourceCode[Key::VertexShader].isEmpty()) {
-            builder.appendSourceFile(QStringLiteral(":/items/shaders/shadereffect.vert"));
+            builder.appendSourceFile(QStringLiteral(":/qt-project.org/items/shaders/shadereffect.vert"));
             s.sourceCode[Key::VertexShader] = builder.source();
         }
         s.className = metaObject()->className();
diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index 95537fdefc..df030d15a7 100644
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -299,8 +299,8 @@ void QQuickCustomMaterialShader::compile()
 
         QSGShaderSourceBuilder::initializeProgramFromFiles(
             program(),
-            QStringLiteral(":/items/shaders/shadereffectfallback.vert"),
-            QStringLiteral(":/items/shaders/shadereffectfallback.frag"));
+            QStringLiteral(":/qt-project.org/items/shaders/shadereffectfallback.vert"),
+            QStringLiteral(":/qt-project.org/items/shaders/shadereffectfallback.frag"));
 
 #ifndef QT_NO_DEBUG
         for (int i = 0; i < attrCount; ++i) {
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index 854582e58e..6327328f8a 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -95,8 +95,8 @@ public:
     SpriteSequenceMaterialData()
         : QSGMaterialShader()
     {
-        setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/items/shaders/sprite.vert"));
-        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/items/shaders/sprite.frag"));
+        setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/items/shaders/sprite.vert"));
+        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/items/shaders/sprite.frag"));
     }
 
     void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *) Q_DECL_OVERRIDE
-- 
cgit v1.2.3


From d438b4f4b93d04a841edf031359e26af617d889d Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Tue, 29 Mar 2016 21:56:46 +0200
Subject: Move Qt Quick scenegraph resources under the :/qt-project.org/
 directory

Change-Id: Ib1c2695f86837b02ba4aaf49184421cd464f7c20
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
 src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp    |  8 ++++----
 src/quick/scenegraph/qsgdefaultglyphnode_p.cpp       | 18 +++++++++---------
 src/quick/scenegraph/qsgdefaultimagenode.cpp         |  4 ++--
 src/quick/scenegraph/qsgdefaultrectanglenode.cpp     |  4 ++--
 src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp | 18 +++++++++---------
 src/quick/scenegraph/scenegraph.qrc                  |  2 +-
 src/quick/scenegraph/util/qsgflatcolormaterial.cpp   |  4 ++--
 src/quick/scenegraph/util/qsgtexturematerial.cpp     |  6 +++---
 src/quick/scenegraph/util/qsgvertexcolormaterial.cpp |  4 ++--
 9 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index dd1ff14924..e829b054fb 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -2060,8 +2060,8 @@ Renderer::ClipType Renderer::updateStencilClip(const QSGClipNode *clip)
                 if (!m_clipProgram.isLinked()) {
                     QSGShaderSourceBuilder::initializeProgramFromFiles(
                         &m_clipProgram,
-                        QStringLiteral(":/scenegraph/shaders/stencilclip.vert"),
-                        QStringLiteral(":/scenegraph/shaders/stencilclip.frag"));
+                        QStringLiteral(":/qt-project.org/scenegraph/shaders/stencilclip.vert"),
+                        QStringLiteral(":/qt-project.org/scenegraph/shaders/stencilclip.frag"));
                     m_clipProgram.bindAttributeLocation("vCoord", 0);
                     m_clipProgram.link();
                     m_clipMatrixId = m_clipProgram.uniformLocation("matrix");
@@ -3071,8 +3071,8 @@ void Renderer::visualize()
         VisualizeShader *prog = new VisualizeShader();
         QSGShaderSourceBuilder::initializeProgramFromFiles(
             prog,
-            QStringLiteral(":/scenegraph/shaders/visualization.vert"),
-            QStringLiteral(":/scenegraph/shaders/visualization.frag"));
+            QStringLiteral(":/qt-project.org/scenegraph/shaders/visualization.vert"),
+            QStringLiteral(":/qt-project.org/scenegraph/shaders/visualization.frag"));
         prog->bindAttributeLocation("v", 0);
         prog->link();
         prog->bind();
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index 9f8788123b..5f4e54b218 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -110,8 +110,8 @@ QSGTextMaskShader::QSGTextMaskShader(QFontEngine::GlyphFormat glyphFormat)
     , m_textureScale_id(-1)
     , m_glyphFormat(glyphFormat)
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/textmask.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/textmask.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/textmask.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/textmask.frag"));
 }
 
 static inline qreal fontSmoothingGamma()
@@ -170,7 +170,7 @@ public:
     QSG8BitTextMaskShader(QFontEngine::GlyphFormat glyphFormat)
         : QSGTextMaskShader(glyphFormat)
     {
-        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/8bittextmask.frag"));
+        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/8bittextmask.frag"));
     }
 
     virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect);
@@ -195,7 +195,7 @@ public:
         : QSGTextMaskShader(glyphFormat)
         , m_useSRGB(false)
     {
-        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/24bittextmask.frag"));
+        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/24bittextmask.frag"));
     }
 
     virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect);
@@ -273,7 +273,7 @@ public:
     QSG32BitColorTextShader(QFontEngine::GlyphFormat glyphFormat)
         : QSGTextMaskShader(glyphFormat)
     {
-        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/32bitcolortext.frag"));
+        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/32bitcolortext.frag"));
     }
 
     void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) Q_DECL_OVERRIDE;
@@ -297,8 +297,8 @@ public:
     QSGStyledTextShader(QFontEngine::GlyphFormat glyphFormat)
         : QSG8BitTextMaskShader(glyphFormat)
     {
-        setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/styledtext.vert"));
-        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/styledtext.frag"));
+        setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/styledtext.vert"));
+        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/styledtext.frag"));
     }
 
     virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect);
@@ -369,8 +369,8 @@ public:
     QSGOutlinedTextShader(QFontEngine::GlyphFormat glyphFormat)
         : QSGStyledTextShader(glyphFormat)
     {
-        setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/outlinedtext.vert"));
-        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/outlinedtext.frag"));
+        setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/outlinedtext.vert"));
+        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/outlinedtext.frag"));
     }
 };
 
diff --git a/src/quick/scenegraph/qsgdefaultimagenode.cpp b/src/quick/scenegraph/qsgdefaultimagenode.cpp
index 1f0b0fa9da..b052ccbe09 100644
--- a/src/quick/scenegraph/qsgdefaultimagenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultimagenode.cpp
@@ -105,8 +105,8 @@ QSGMaterialShader *QSGSmoothTextureMaterial::createShader() const
 SmoothTextureMaterialShader::SmoothTextureMaterialShader()
     : QSGTextureMaterialShader()
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/smoothtexture.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/smoothtexture.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/smoothtexture.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/smoothtexture.frag"));
 }
 
 void SmoothTextureMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
diff --git a/src/quick/scenegraph/qsgdefaultrectanglenode.cpp b/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
index f3f5c7f79f..3b7e3b38ba 100644
--- a/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
@@ -118,8 +118,8 @@ private:
 SmoothColorMaterialShader::SmoothColorMaterialShader()
     : QSGMaterialShader()
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/smoothcolor.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/smoothcolor.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/smoothcolor.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/smoothcolor.frag"));
 }
 
 void SmoothColorMaterialShader::updateState(const RenderState &state, QSGMaterial *, QSGMaterial *oldEffect)
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
index 6f4b85a5b9..52d7979203 100644
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
@@ -88,8 +88,8 @@ QSGDistanceFieldTextMaterialShader::QSGDistanceFieldTextMaterialShader()
     , m_lastAlphaMin(-1)
     , m_lastAlphaMax(-1)
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/distancefieldtext.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/distancefieldtext.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/distancefieldtext.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/distancefieldtext.frag"));
 }
 
 void QSGDistanceFieldTextMaterialShader::updateAlphaRange(ThresholdFunc thresholdFunc, AntialiasingSpreadFunc spreadFunc)
@@ -339,7 +339,7 @@ DistanceFieldOutlineTextMaterialShader::DistanceFieldOutlineTextMaterialShader()
     , m_outlineAlphaMax0_id(-1)
     , m_outlineAlphaMax1_id(-1)
 {
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/distancefieldoutlinetext.frag"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/distancefieldoutlinetext.frag"));
 }
 
 void DistanceFieldOutlineTextMaterialShader::initialize()
@@ -421,8 +421,8 @@ DistanceFieldShiftedStyleTextMaterialShader::DistanceFieldShiftedStyleTextMateri
     : DistanceFieldStyledTextMaterialShader()
     , m_shift_id(-1)
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/distancefieldshiftedtext.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/distancefieldshiftedtext.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/distancefieldshiftedtext.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/distancefieldshiftedtext.frag"));
 }
 
 void DistanceFieldShiftedStyleTextMaterialShader::initialize()
@@ -501,8 +501,8 @@ QSGHiQSubPixelDistanceFieldTextMaterialShader::QSGHiQSubPixelDistanceFieldTextMa
     , m_fontScale_id(-1)
     , m_vecDelta_id(-1)
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/hiqsubpixeldistancefieldtext.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/hiqsubpixeldistancefieldtext.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/hiqsubpixeldistancefieldtext.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/hiqsubpixeldistancefieldtext.frag"));
 }
 
 void QSGHiQSubPixelDistanceFieldTextMaterialShader::initialize()
@@ -568,8 +568,8 @@ public:
 QSGLoQSubPixelDistanceFieldTextMaterialShader::QSGLoQSubPixelDistanceFieldTextMaterialShader()
     : QSGHiQSubPixelDistanceFieldTextMaterialShader()
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/loqsubpixeldistancefieldtext.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/loqsubpixeldistancefieldtext.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/loqsubpixeldistancefieldtext.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/loqsubpixeldistancefieldtext.frag"));
 }
 
 QSGMaterialType *QSGLoQSubPixelDistanceFieldTextMaterial::type() const
diff --git a/src/quick/scenegraph/scenegraph.qrc b/src/quick/scenegraph/scenegraph.qrc
index 5db242e46b..ef6da71334 100644
--- a/src/quick/scenegraph/scenegraph.qrc
+++ b/src/quick/scenegraph/scenegraph.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/scenegraph">
+    <qresource prefix="/qt-project.org/scenegraph">
         <file>shaders/flatcolor.frag</file>
         <file>shaders/flatcolor.vert</file>
         <file>shaders/8bittextmask.frag</file>
diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
index 754d2fb33a..9f12cfc96e 100644
--- a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
@@ -60,8 +60,8 @@ QSGMaterialType FlatColorMaterialShader::type;
 FlatColorMaterialShader::FlatColorMaterialShader()
     : QSGMaterialShader(*new QSGMaterialShaderPrivate)
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/flatcolor.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/flatcolor.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/flatcolor.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/flatcolor.frag"));
 }
 
 void FlatColorMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp
index 6bfaaf0080..c5655b9bb3 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.cpp
+++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp
@@ -50,8 +50,8 @@ QSGMaterialType QSGOpaqueTextureMaterialShader::type;
 QSGOpaqueTextureMaterialShader::QSGOpaqueTextureMaterialShader()
     : QSGMaterialShader()
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/opaquetexture.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/opaquetexture.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/opaquetexture.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/opaquetexture.frag"));
 }
 
 char const *const *QSGOpaqueTextureMaterialShader::attributeNames() const
@@ -356,7 +356,7 @@ QSGMaterialShader *QSGTextureMaterial::createShader() const
 QSGTextureMaterialShader::QSGTextureMaterialShader()
     : QSGOpaqueTextureMaterialShader()
 {
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/texture.frag"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/texture.frag"));
 }
 
 void QSGTextureMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
index 1c83d10de0..05cde75288 100644
--- a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
@@ -59,8 +59,8 @@ QSGMaterialType QSGVertexColorMaterialShader::type;
 QSGVertexColorMaterialShader::QSGVertexColorMaterialShader()
     : QSGMaterialShader()
 {
-    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/vertexcolor.vert"));
-    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/vertexcolor.frag"));
+    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/vertexcolor.vert"));
+    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/vertexcolor.frag"));
 }
 
 void QSGVertexColorMaterialShader::updateState(const RenderState &state, QSGMaterial * /*newEffect*/, QSGMaterial *)
-- 
cgit v1.2.3


From a676e4e2dae945c02521691c7018f5a5534feff9 Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@viroteck.net>
Date: Tue, 29 Mar 2016 11:55:57 +0200
Subject: qml: Remove unused QHashField class.

Change-Id: I8dd234d06048e6d8e7b2dfccb59d639ad167022b
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/qml/qml/ftw/ftw.pri        |   1 -
 src/qml/qml/ftw/qhashfield_p.h | 112 -----------------------------------------
 2 files changed, 113 deletions(-)
 delete mode 100644 src/qml/qml/ftw/qhashfield_p.h

diff --git a/src/qml/qml/ftw/ftw.pri b/src/qml/qml/ftw/ftw.pri
index 51697b0aff..a671cfa12d 100644
--- a/src/qml/qml/ftw/ftw.pri
+++ b/src/qml/qml/ftw/ftw.pri
@@ -5,7 +5,6 @@ HEADERS +=  \
     $$PWD/qhashedstring_p.h \
     $$PWD/qqmlrefcount_p.h \
     $$PWD/qfieldlist_p.h \
-    $$PWD/qhashfield_p.h \
     $$PWD/qqmlthread_p.h \
     $$PWD/qfinitestack_p.h \
     $$PWD/qrecursionwatcher_p.h \
diff --git a/src/qml/qml/ftw/qhashfield_p.h b/src/qml/qml/ftw/qhashfield_p.h
deleted file mode 100644
index 461cadfd98..0000000000
--- a/src/qml/qml/ftw/qhashfield_p.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QHASHFIELD_P_H
-#define QHASHFIELD_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-// QHashField can be used for doing coarse grained set testing, in
-// cases where you do not expect the set to contain the item.  For
-// example where you would write:
-//     QSet<QString> strings;
-//     for (int ii = 0; ii < mystrings.count(); ++ii) {
-//         if (strings.contains(mystrings.at(ii)))
-//             qFatal("Duplication!");
-//         strings.insert(mystrings);
-//     }
-// You may write:
-//     QHashField strings;
-//     for (int ii = 0; ii < mystrings.count(); ++ii) {
-//         if (strings.testAndSet(qHash(mystrings.at(ii)))) {
-//             // The string *might* be duplicated
-//             for (int jj = 0; jj < ii; ++jj) {
-//                 if (mystrings.at(ii) == mystrings.at(jj))
-//                     qFatal("Duplication!");
-//             }
-//          }
-//     }
-// For small lists of things, where the hash is cheap to calculate
-// and you don't expect duplication this will be much faster.
-class QHashField {
-public:
-    inline QHashField();
-
-    inline void clear();
-
-    inline bool test(quint32 hash);
-    inline bool testAndSet(quint32 hash);
-private:
-    quint32 m_field;
-};
-
-QHashField::QHashField()
-: m_field(0)
-{
-}
-
-void QHashField::clear()
-{
-    m_field = 0;
-}
-
-bool QHashField::test(quint32 hash)
-{
-    return m_field & (1 << (hash % 31));
-}
-
-bool QHashField::testAndSet(quint32 hash)
-{
-    quint32 mask = 1 << (hash % 31);
-    bool rv = m_field & mask;
-    m_field |= mask;
-    return rv;
-}
-
-QT_END_NAMESPACE
-
-#endif // QHASHFIELD_P_H
-- 
cgit v1.2.3