Merge remote-tracking branch 'origin/5.6' into 5.7

Part of 0e053528 was reverted in the merge, about lastTimestamp. It
will be applied later in separate commit.

qmltest::shadersource-dynamic-sourceobject::test_endresult() was
blacklisted on linux.

Conflicts:
	.qmake.conf
	tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
	tests/auto/qmltest/BLACKLIST
	tests/auto/qmltest/qmltest.pro

Task-number: QTBUG-53590
Task-number: QTBUG-53971
Change-Id: I48af90b49a3c7b29de16f4178a04807f8bc05130

27 files changed, 91 insertions, 1820 deletions

diff --git a/tests/auto/qmltest/BLACKLIST b/tests/auto/qmltest/BLACKLIST
index cd8b1181e0..86a98a2c9c 100644
--- a/tests/auto/qmltest/BLACKLIST
+++ b/tests/auto/qmltest/BLACKLIST
@@ -3,3 +3,12 @@
 *
 [SelfTests::test_blacklistWithData:test2]
 *
+[shadersource-dynamic-sourceobject::test_endresult]
+linux
+[tst_grabImage::test_equals]
+linux
+[Text::test_linecount]
+osx
+windows
+[TextInput::test_doublevalidators]
+osx
diff --git a/tests/auto/qmltest/animators/Box.qml b/tests/auto/qmltest/animators/Box.qml
deleted file mode 100644
index 88a74e8a54..0000000000
--- a/tests/auto/qmltest/animators/Box.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-
-Rectangle {
-    id: box
-    gradient: Gradient {
-        GradientStop { position: 0.1; color: "red" }
-        GradientStop { position: 0.9; color: "blue" }
-    }
-    width: 100
-    height: 100
-    anchors.centerIn: parent
-    antialiasing: true
-
-    property int rotationChangeCounter: 0
-    onRotationChanged: ++rotationChangeCounter;
-
-    property int scaleChangeCounter: 0
-    onScaleChanged: ++scaleChangeCounter;
-
-    property int opacityChangeCounter: 0
-    onOpacityChanged: ++opacityChangeCounter
-
-    property int xChangeCounter: 0;
-    onXChanged: ++xChangeCounter;
-
-    property int yChangeCounter: 0;
-    onYChanged: ++yChangeCounter;
-
-}
diff --git a/tests/auto/qmltest/animators/tst_behavior.qml b/tests/auto/qmltest/animators/tst_behavior.qml
deleted file mode 100644
index 1a17c0528e..0000000000
--- a/tests/auto/qmltest/animators/tst_behavior.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testcase
-        name: "animators-behavior"
-        when: box.scale == 2
-        function test_endresult() {
-            compare(box.scaleChangeCounter, 1);
-            compare(box.scale, 2);
-            var image = grabImage(root);
-
-            verify(image.pixel(0, 0) == Qt.rgba(1, 0, 0));
-            verify(image.pixel(199, 199) == Qt.rgba(0, 0, 1));
-        }
-    }
-
-    Box {
-        id: box
-        Behavior on scale { ScaleAnimator { id: animation; duration: 100; } }
-    }
-
-    Timer {
-        interval: 100;
-        repeat: false
-        running: true
-        onTriggered: box.scale = 2
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_mixed.qml b/tests/auto/qmltest/animators/tst_mixed.qml
deleted file mode 100644
index 5ad698254f..0000000000
--- a/tests/auto/qmltest/animators/tst_mixed.qml
+++ /dev/null
@@ -1,166 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Jolla Ltd, author: <gunnar.sletta@jollamobile.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testCase
-        name: "animators-mixed"
-        when: !rootAnimation.running
-        function test_endresult() {
-            compare(box.rootStart, 2);
-            compare(box.rootEnd, 2);
-
-            compare(parallelWithOneSequential.before, 4);
-            compare(parallelWithOneSequential.scaleUpdates, 4);
-
-            compare(parallelWithTwoSequentialNormalEndsLast.beforeAnimator, 4);
-            compare(parallelWithTwoSequentialNormalEndsLast.scaleUpdates, 4);
-            compare(parallelWithTwoSequentialNormalEndsLast.afterAnimator, 4);
-            compare(parallelWithTwoSequentialNormalEndsLast.beforePause, 4);
-            compare(parallelWithTwoSequentialNormalEndsLast.afterPause, 4);
-
-            compare(parallelWithTwoSequentialNormalEndsFirst.beforeAnimator, 4);
-            compare(parallelWithTwoSequentialNormalEndsFirst.scaleUpdates, 4);
-            compare(parallelWithTwoSequentialNormalEndsFirst.afterAnimator, 4);
-            compare(parallelWithTwoSequentialNormalEndsFirst.beforePause, 4);
-            compare(parallelWithTwoSequentialNormalEndsFirst.afterPause, 4);
-
-        }
-    }
-
-    Box {
-        id: box
-
-        property int rootStart : 0
-        property int rootEnd : 0;
-
-        SequentialAnimation {
-            id: rootAnimation
-
-            running: true
-            loops: 2
-
-            ScriptAction { script: box.rootStart++; }
-
-            ParallelAnimation {
-                id: parallelWithOneSequential
-                property int before : 0;
-                property int scaleUpdates : 0;
-                loops: 2
-                SequentialAnimation {
-                    ScriptAction { script: {
-                            parallelWithOneSequential.before++;
-                            box.scale = 1;
-                            box.scaleChangeCounter = 0;
-                        }
-                    }
-                    ScaleAnimator { target: box; from: 1; to: 2; duration: 100; }
-                    ScriptAction { script: {
-                            parallelWithOneSequential.scaleUpdates += box.scaleChangeCounter;
-                        }
-                    }
-                }
-            }
-
-            ParallelAnimation {
-                id: parallelWithTwoSequentialNormalEndsLast
-                property int beforeAnimator : 0;
-                property int scaleUpdates : 0;
-                property int afterAnimator : 0;
-                property int beforePause : 0;
-                property int afterPause : 0;
-                loops: 2
-                SequentialAnimation {
-                    ScriptAction { script: {
-                            parallelWithTwoSequentialNormalEndsLast.beforeAnimator++;
-                            box.scale = 1;
-                            box.scaleChangeCounter = 0;
-                        }
-                    }
-                    ScaleAnimator { target: box; from: 1; to: 2; duration: 100; }
-                    ScriptAction { script: {
-                            parallelWithTwoSequentialNormalEndsLast.scaleUpdates += box.scaleChangeCounter;
-                            parallelWithTwoSequentialNormalEndsLast.afterAnimator++;
-                        }
-                    }
-                }
-                SequentialAnimation {
-                    ScriptAction { script: {
-                            parallelWithTwoSequentialNormalEndsLast.beforePause++
-                        }
-                    }
-                    PauseAnimation { duration: 200 }
-                    ScriptAction { script: {
-                            parallelWithTwoSequentialNormalEndsLast.afterPause++
-                        }
-                    }
-                }
-            }
-
-            ParallelAnimation {
-                id: parallelWithTwoSequentialNormalEndsFirst
-                property int beforeAnimator : 0;
-                property int scaleUpdates : 0;
-                property int afterAnimator : 0;
-                property int beforePause : 0;
-                property int afterPause : 0;
-                loops: 2
-                SequentialAnimation {
-                    ScriptAction { script: {
-                            parallelWithTwoSequentialNormalEndsFirst.beforeAnimator++;
-                            box.scale = 1;
-                            box.scaleChangeCounter = 0;
-                        }
-                    }
-                    ScaleAnimator { target: box; from: 1; to: 2; duration: 200; }
-                    ScriptAction { script: {
-                            parallelWithTwoSequentialNormalEndsFirst.scaleUpdates += box.scaleChangeCounter;
-                            parallelWithTwoSequentialNormalEndsFirst.afterAnimator++;
-                        }
-                    }
-                }
-                SequentialAnimation {
-                    ScriptAction { script: parallelWithTwoSequentialNormalEndsFirst.beforePause++ }
-                    PauseAnimation { duration: 100 }
-                    ScriptAction { script: parallelWithTwoSequentialNormalEndsFirst.afterPause++ }
-                }
-            }
-
-            ScriptAction { script: box.rootEnd++; }
-        }
-
-    }
-
-}
diff --git a/tests/auto/qmltest/animators/tst_mixedparallel.qml b/tests/auto/qmltest/animators/tst_mixedparallel.qml
deleted file mode 100644
index 236f250306..0000000000
--- a/tests/auto/qmltest/animators/tst_mixedparallel.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testcase
-        name: "animators-mixedparallel"
-        when: !animation.running
-        function test_endresult() {
-            compare(box.rotationChangeCounter, 1);
-            compare(box.scale, 2);
-            compare(box.rotation, 180);
-            var image = grabImage(root);
-            verify(image.pixel(0, 0) == Qt.rgba(0, 0, 1));
-            verify(image.pixel(199, 199) == Qt.rgba(1, 0, 0));
-        }
-    }
-
-    Box {
-        id: box
-        ParallelAnimation {
-            id: animation
-            NumberAnimation { target: box; property: "scale"; from: 1; to: 2.0; duration: 100; }
-            RotationAnimator { target: box; from: 0; to: 180; duration: 100; }
-            running: true
-            loops: 1;
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_mixedsequential.qml b/tests/auto/qmltest/animators/tst_mixedsequential.qml
deleted file mode 100644
index 771c5f33ce..0000000000
--- a/tests/auto/qmltest/animators/tst_mixedsequential.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testcase
-        name: "animators-mixedsequential"
-        when: !animation.running
-        function test_endresult() {
-            compare(box.rotationChangeCounter, 1);
-            compare(box.scale, 2);
-            compare(box.rotation, 180);
-            var image = grabImage(root);
-            verify(image.pixel(0, 0) == Qt.rgba(0, 0, 1));
-            verify(image.pixel(199, 199) == Qt.rgba(1, 0, 0));
-        }
-    }
-
-    Box {
-        id: box
-        ParallelAnimation {
-            id: animation
-            NumberAnimation { target: box; property: "scale"; from: 1; to: 2.0; duration: 100; }
-            RotationAnimator { target: box; from: 0; to: 180; duration: 100; }
-            running: true
-            loops: 1;
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_multiwindow.qml b/tests/auto/qmltest/animators/tst_multiwindow.qml
deleted file mode 100644
index 8ea6aab9a7..0000000000
--- a/tests/auto/qmltest/animators/tst_multiwindow.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Jolla Ltd, author: <gunnar.sletta@jollamobile.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-import QtQuick.Window 2.0
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testCase
-        name: "animators-mixed"
-        when: countdown == 0
-        function test_endresult() {
-            verify(true, "Just making sure we didn't crash");
-        }
-    }
-
-    property int countdown: 5;
-
-    Window {
-        id: window
-
-        width: 100
-        height: 100
-
-        ShaderEffect {
-            width: 50
-            height: 50
-
-            property real t;
-            UniformAnimator on t { from: 0; to: 1; duration: 1000; loops: Animation.Infinite }
-            RotationAnimator on rotation { from: 0; to: 360; duration: 1000; loops: Animation.Infinite }
-            ScaleAnimator on scale { from: 0.5; to: 1.5; duration: 1000; loops: Animation.Infinite }
-            XAnimator on x { from: 0; to: 50; duration: 1000; loops: Animation.Infinite }
-            YAnimator on y { from: 0; to: 50; duration: 1000; loops: Animation.Infinite }
-            OpacityAnimator on opacity { from: 1; to: 0.5; duration: 1000; loops: Animation.Infinite }
-
-            fragmentShader: "
-                uniform lowp float t;
-                uniform lowp float qt_Opacity;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    gl_FragColor = vec4(qt_TexCoord0, t, 1) * qt_Opacity;
-                }
-                "
-        }
-
-        visible: true
-    }
-
-    Timer {
-        interval: 250
-        running: true
-        repeat: true
-        onTriggered: {
-            if (window.visible)
-                --countdown
-            window.visible = !window.visible;
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_nested.qml b/tests/auto/qmltest/animators/tst_nested.qml
deleted file mode 100644
index 7f35118dda..0000000000
--- a/tests/auto/qmltest/animators/tst_nested.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testCase
-        name: "animators-nested"
-        when: !animation.running
-        function test_endresult() {
-            compare(box.before, 2);
-            compare(box.after, 2);
-        }
-    }
-
-    Box {
-        id: box
-
-        anchors.centerIn: undefined
-
-        property int before: 0;
-        property int after: 0;
-
-        SequentialAnimation {
-            id: animation;
-            ScriptAction { script: box.before++; }
-            ParallelAnimation {
-                ScaleAnimator { target: box; from: 2.0; to: 1; duration: 100; }
-                OpacityAnimator { target: box; from: 0; to: 1; duration: 100; }
-            }
-            PauseAnimation { duration: 100 }
-            SequentialAnimation {
-                ParallelAnimation {
-                    XAnimator { target: box; from: 0; to: 100; duration: 100 }
-                    RotationAnimator { target: box; from: 0; to: 90; duration: 100 }
-                }
-                ParallelAnimation {
-                    XAnimator { target: box; from: 100; to: 0; duration: 100 }
-                    RotationAnimator { target: box; from: 90; to: 0; duration: 100 }
-                }
-            }
-            ScriptAction { script: box.after++; }
-            running: true
-            loops: 2
-        }
-    }
-
-}
diff --git a/tests/auto/qmltest/animators/tst_on.qml b/tests/auto/qmltest/animators/tst_on.qml
deleted file mode 100644
index 5bcbfa2a2e..0000000000
--- a/tests/auto/qmltest/animators/tst_on.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testCase
-        name: "animators-on"
-        when: !animx.running && !animy.running
-              && !anims.running && !animr.running
-              && !animo.running;
-        function test_endresult() {
-            tryCompare(box, 'xChangeCounter', 1);
-            compare(box.yChangeCounter, 1);
-            compare(box.scaleChangeCounter, 1);
-            compare(box.rotationChangeCounter, 1);
-            compare(box.opacityChangeCounter, 1);
-            compare(box.x, 100);
-            compare(box.y, 100);
-            compare(box.scale, 2);
-            compare(box.rotation, 180);
-            compare(box.opacity, 0.5);
-        }
-    }
-
-    Box {
-        id: box
-        anchors.centerIn: undefined
-        XAnimator on x { id: animx; from: 0; to: 100; duration: 100 }
-        YAnimator on y { id: animy; from: 0; to: 100; duration: 100 }
-        ScaleAnimator on scale { id: anims; from: 1; to: 2; duration: 100 }
-        RotationAnimator on rotation { id: animr ; from: 0; to: 180; duration: 100 }
-        OpacityAnimator on opacity { id: animo; from: 1; to: 0.5; duration: 100 }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_opacity.qml b/tests/auto/qmltest/animators/tst_opacity.qml
deleted file mode 100644
index 41d09b18c6..0000000000
--- a/tests/auto/qmltest/animators/tst_opacity.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testCase
-        name: "animators-opacity"
-        when: box.opacity == 0.5
-        function test_endresult() {
-            compare(box.opacityChangeCounter, 1);
-            var image = grabImage(root);
-            compare(image.red(50, 50), 255);
-            verify(image.green(50, 50) > 0);
-            verify(image.blue(50, 50) > 0);
-        }
-    }
-
-    Box {
-        id: box
-
-        OpacityAnimator {
-            id: animation
-            target: box
-            from: 1;
-            to: 0.5
-            duration: 100
-            running: true
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_parallel.qml b/tests/auto/qmltest/animators/tst_parallel.qml
deleted file mode 100644
index ac7acf2536..0000000000
--- a/tests/auto/qmltest/animators/tst_parallel.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testcase
-        name: "animators-parallel"
-        when: !animation.running
-        function test_endresult() {
-            compare(box.rotationChangeCounter, 1);
-            compare(box.scaleChangeCounter, 1);
-            compare(box.scale, 2);
-            compare(box.rotation, 180);
-            var image = grabImage(root);
-            verify(image.pixel(0, 0) == Qt.rgba(0, 0, 1));
-            verify(image.pixel(199, 199) == Qt.rgba(1, 0, 0));
-        }
-    }
-
-    Box {
-        id: box
-        ParallelAnimation {
-            id: animation
-            ScaleAnimator { target: box; from: 1; to: 2.0; duration: 100; }
-            RotationAnimator { target: box; from: 0; to: 180; duration: 100; }
-            running: true
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_restart.qml b/tests/auto/qmltest/animators/tst_restart.qml
deleted file mode 100644
index 66f395c938..0000000000
--- a/tests/auto/qmltest/animators/tst_restart.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    property int restartCount: 5;
-
-    TestCase {
-        id: testcase
-        name: "animators-restart"
-        when: root.restartCount == 0 && animation.running == false;
-        function test_endresult() {
-            compare(box.scale, 2);
-        }
-    }
-
-    Box {
-        id: box
-
-        ScaleAnimator {
-            id: animation
-            target: box;
-            from: 1;
-            to: 2.0;
-            duration: 100;
-            loops: 1
-            running: false;
-        }
-
-        Timer {
-            id: timer;
-            interval: 500
-            running: true
-            repeat: true
-            onTriggered: {
-                animation.running = true;
-                --root.restartCount;
-            }
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_rotation.qml b/tests/auto/qmltest/animators/tst_rotation.qml
deleted file mode 100644
index b181912299..0000000000
--- a/tests/auto/qmltest/animators/tst_rotation.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testCase
-        name: "animators-rotation"
-        when: box.rotation == 180
-        function test_endresult() {
-            compare(box.rotationChangeCounter, 1);
-            var image = grabImage(root);
-            verify(image.pixel(50, 50) == Qt.rgba(0, 0, 1));
-        }
-    }
-
-    Box {
-        id: box
-        RotationAnimator {
-            id: animation
-            target: box
-            from: 0;
-            to: 180
-            duration: 100
-            easing.type: Easing.InOutBack
-            running: true
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_scale.qml b/tests/auto/qmltest/animators/tst_scale.qml
deleted file mode 100644
index 0e1abcf729..0000000000
--- a/tests/auto/qmltest/animators/tst_scale.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testCase
-        name: "animators-scale"
-        when: box.scale == 2;
-        function test_endresult() {
-            compare(box.scaleChangeCounter, 1);
-            var image = grabImage(root);
-            verify(image.pixel(0, 0) == Qt.rgba(1, 0, 0));
-        }
-    }
-
-    Box {
-        id: box
-
-        ScaleAnimator {
-            id: animation
-            target: box
-            from: 1;
-            to: 2.0
-            duration: 100
-            easing.type: Easing.InOutCubic
-            running: true
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_sequential.qml b/tests/auto/qmltest/animators/tst_sequential.qml
deleted file mode 100644
index e8b4e98917..0000000000
--- a/tests/auto/qmltest/animators/tst_sequential.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testcase
-        name: "animators-parallel"
-        when: !animation.running
-        function test_endresult() {
-            compare(box.rotationChangeCounter, 1);
-            compare(box.scaleChangeCounter, 1);
-            compare(box.scale, 2);
-            compare(box.rotation, 180);
-            var image = grabImage(root);
-            compare(image.pixel(0, 0), Qt.rgba(0, 0, 1, 1));
-            compare(image.pixel(199, 199), Qt.rgba(1, 0, 0, 1));
-        }
-    }
-
-    Box {
-        id: box
-        SequentialAnimation {
-            id: animation
-            ScaleAnimator { target: box; from: 1; to: 2.0; duration: 100; }
-            RotationAnimator { target: box; from: 0; to: 180; duration: 100; }
-            running: true
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_targetdestroyed.qml b/tests/auto/qmltest/animators/tst_targetdestroyed.qml
deleted file mode 100644
index 588777ce1c..0000000000
--- a/tests/auto/qmltest/animators/tst_targetdestroyed.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Gunnar Sletta <gunnar@sletta.org>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testcase
-        name: "animators-targetdestroyed"
-        when: false
-        function test_endresult() {
-            verify(true, "Got here :)");
-        }
-    }
-
-    Rectangle {
-        id: box
-        width: 10
-        height: 10
-        color: "steelblue"
-    }
-
-    YAnimator {
-        id: anim
-        target: box
-        from: 0;
-        to: 100
-        duration: 100
-        loops: Animation.Infinite
-        running: true
-    }
-
-    SequentialAnimation {
-        running: true
-        PauseAnimation { duration: 150 }
-        ScriptAction { script: box.destroy(); }
-        PauseAnimation { duration: 50 }
-        ScriptAction { script: anim.destroy(); }
-        PauseAnimation { duration: 50 }
-        ScriptAction { script: testcase.when = true }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_transformorigin.qml b/tests/auto/qmltest/animators/tst_transformorigin.qml
deleted file mode 100644
index e9c8a16598..0000000000
--- a/tests/auto/qmltest/animators/tst_transformorigin.qml
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 300
-    height: 300
-
-    Timer {
-        id: timer;
-        running: testCase.windowShown
-        interval: 1000
-        repeat: false
-        onTriggered: triggered = true;
-        property bool triggered: false;
-    }
-
-    TestCase {
-        id: testCase
-        name: "animators-transformorigin"
-        when: timer.triggered
-        function test_endresult() {
-
-            var image = grabImage(root);
-
-            var white = Qt.rgba(1, 1, 1);
-            var blue = Qt.rgba(0, 0, 1);
-
-
-            // topleft
-            verify(image.pixel(40, 40) == white);
-            verify(image.pixel(60, 40) == white);
-            verify(image.pixel(40, 60) == white);
-            verify(image.pixel(60, 60) == blue);
-
-            // top
-            verify(image.pixel(140, 40) == white);
-            verify(image.pixel(160, 40) == white);
-            verify(image.pixel(140, 60) == blue);
-            verify(image.pixel(160, 60) == blue);
-
-            // topright
-            verify(image.pixel(240, 40) == white);
-            verify(image.pixel(260, 40) == white);
-            verify(image.pixel(240, 60) == blue);
-            verify(image.pixel(260, 60) == white);
-
-
-            // left
-            verify(image.pixel(40, 140) == white);
-            verify(image.pixel(60, 140) == blue);
-            verify(image.pixel(40, 160) == white);
-            verify(image.pixel(60, 160) == blue);
-
-            // center
-            verify(image.pixel(140, 140) == blue);
-            verify(image.pixel(160, 140) == blue);
-            verify(image.pixel(140, 160) == blue);
-            verify(image.pixel(160, 160) == blue);
-
-            // right
-            verify(image.pixel(240, 140) == blue);
-            verify(image.pixel(260, 140) == white);
-            verify(image.pixel(240, 160) == blue);
-            verify(image.pixel(260, 160) == white);
-
-
-            // bottomleft
-            verify(image.pixel(40, 240) == white);
-            verify(image.pixel(60, 240) == blue);
-            verify(image.pixel(40, 260) == white);
-            verify(image.pixel(60, 260) == white);
-
-            // bottom
-            verify(image.pixel(140, 240) == blue);
-            verify(image.pixel(160, 240) == blue);
-            verify(image.pixel(140, 260) == white);
-            verify(image.pixel(160, 260) == white);
-
-            // bottomright
-            verify(image.pixel(240, 240) == blue);
-            verify(image.pixel(260, 240) == white);
-            verify(image.pixel(240, 260) == white);
-            verify(image.pixel(260, 260) == white);
-
-        }
-    }
-
-    property var origins: [Item.TopLeft, Item.Top, Item.TopRight,
-                           Item.Left, Item.Center, Item.Right,
-                           Item.BottomLeft, Item.Bottom, Item.BottomRight];
-
-    Grid {
-        anchors.fill: parent
-        rows: 3
-        columns: 3
-
-        Repeater {
-            model: 9
-            Item {
-                width: 100
-                height: 100
-                Rectangle {
-                    id: box
-                    color: "blue"
-                    anchors.centerIn: parent
-                    width: 10
-                    height: 10
-                    antialiasing: true;
-
-                    transformOrigin: root.origins[index];
-
-                    ScaleAnimator { target: box; from: 1; to: 5.5; duration: 100; running: true; }
-                }
-            }
-        }
-    }
-
-}
diff --git a/tests/auto/qmltest/animators/tst_transition.qml b/tests/auto/qmltest/animators/tst_transition.qml
deleted file mode 100644
index 1e95ed56c0..0000000000
--- a/tests/auto/qmltest/animators/tst_transition.qml
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testcase
-        name: "animators-transition"
-        when: box.scale == 2
-        function test_endresult() {
-            compare(box.scaleChangeCounter, 1);
-            compare(box.scale, 2);
-            var image = grabImage(root);
-            verify(image.pixel(0, 0) == Qt.rgba(1, 0, 0));
-            verify(image.pixel(199, 199) == Qt.rgba(0, 0, 1));
-        }
-    }
-
-    states: [
-        State {
-            name: "one"
-            PropertyChanges { target: box; scale: 1 }
-        },
-        State {
-            name: "two"
-            PropertyChanges { target: box; scale: 2 }
-        }
-    ]
-    state: "one"
-
-    transitions: [
-        Transition {
-            ScaleAnimator { duration: 100; }
-        }
-    ]
-
-    Box {
-        id: box
-    }
-
-    Timer {
-        interval: 100;
-        repeat: false
-        running: true
-        onTriggered: root.state = "two"
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_x.qml b/tests/auto/qmltest/animators/tst_x.qml
deleted file mode 100644
index 7a89bf564c..0000000000
--- a/tests/auto/qmltest/animators/tst_x.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 200
-    height: 200
-
-    TestCase {
-        id: testCase
-        name: "animators-x"
-        when: box.x == 100
-        function test_endresult() {
-            compare(box.xChangeCounter, 1);
-            var image = grabImage(root);
-            verify(image.pixel(100, 0) == Qt.rgba(1, 0, 0));
-            verify(image.pixel(99, 0) == Qt.rgba(1, 1, 1)); // outside on the left
-        }
-    }
-
-    Box {
-        id: box
-
-        anchors.centerIn: undefined
-
-        XAnimator {
-            id: animation
-            target: box
-            from: 0;
-            to: 100
-            duration: 100
-            running: true
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_y.qml b/tests/auto/qmltest/animators/tst_y.qml
deleted file mode 100644
index abb73db7c1..0000000000
--- a/tests/auto/qmltest/animators/tst_y.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-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: 100
-            running: true
-        }
-    }
-}
diff --git a/tests/auto/qmltest/animators/tst_zeroduration.qml b/tests/auto/qmltest/animators/tst_zeroduration.qml
deleted file mode 100644
index 83ce235f42..0000000000
--- a/tests/auto/qmltest/animators/tst_zeroduration.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-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
-        }
-    }
-}
diff --git a/tests/auto/qmltest/item/tst_layerInPositioner.qml b/tests/auto/qmltest/item/tst_layerInPositioner.qml
deleted file mode 100644
index da081fb5fe..0000000000
--- a/tests/auto/qmltest/item/tst_layerInPositioner.qml
+++ /dev/null
@@ -1,194 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Jolla Ltd, author: <gunnar.sletta@jollamobile.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.4
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 400
-    height: 400
-
-    TestCase {
-        id: testCase
-        name: "transparentForPositioner"
-        when: windowShown
-        function test_endresult() {
-            var image = grabImage(root);
-
-            // Row of red, green, blue and white box inside blue
-            // At 10,10, spanning 10x10 pixels each
-            verify(image.pixel(10, 10) == Qt.rgba(1, 0, 0, 1));
-            verify(image.pixel(20, 10) == Qt.rgba(0, 1, 0, 1));
-            verify(image.pixel(30, 10) == Qt.rgba(0, 0, 1, 1));
-
-            // Column of red, green, blue and white box inside blue
-            // At 10,30, spanning 10x10 pixels each
-            verify(image.pixel(10, 30) == Qt.rgba(1, 0, 0, 1));
-            verify(image.pixel(10, 40) == Qt.rgba(0, 1, 0, 1));
-            verify(image.pixel(10, 50) == Qt.rgba(0, 0, 1, 1));
-
-            // Flow of red, green, blue and white box inside blue
-            // At 30,30, spanning 10x10 pixels each, wrapping after two boxes
-            verify(image.pixel(30, 30) == Qt.rgba(1, 0, 0, 1));
-            verify(image.pixel(40, 30) == Qt.rgba(0, 1, 0, 1));
-            verify(image.pixel(30, 40) == Qt.rgba(0, 0, 1, 1));
-
-            // Flow of red, green, blue and white box inside blue
-            // At 100,10, spanning 10x10 pixels each, wrapping after two boxes
-            verify(image.pixel(60, 10) == Qt.rgba(1, 0, 0, 1));
-            verify(image.pixel(70, 10) == Qt.rgba(0, 1, 0, 1));
-            verify(image.pixel(60, 20) == Qt.rgba(0, 0, 1, 1));
-        }
-    }
-
-    Component {
-        id: greenPassThrough
-        ShaderEffect {
-            fragmentShader:
-            "
-                uniform lowp sampler2D source;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    gl_FragColor = texture2D(source, qt_TexCoord0) * vec4(0, 1, 0, 1);
-                }
-            "
-        }
-    }
-
-    Row {
-        id: theRow
-        x: 10
-        y: 10
-        Rectangle {
-            width: 10
-            height: 10
-            color: "#ff0000"
-            layer.enabled: true
-        }
-
-        Rectangle {
-            width: 10
-            height: 10
-            color: "#ffffff"
-            layer.enabled: true
-            layer.effect: greenPassThrough
-        }
-
-        Rectangle {
-            id: blueInRow
-            width: 10
-            height: 10
-            color: "#0000ff"
-        }
-    }
-
-    Column {
-        id: theColumn
-        x: 10
-        y: 30
-        Rectangle {
-            width: 10
-            height: 10
-            color: "#ff0000"
-            layer.enabled: true
-        }
-
-        Rectangle {
-            width: 10
-            height: 10
-            color: "#ffffff"
-            layer.enabled: true
-            layer.effect: greenPassThrough
-        }
-
-        Rectangle {
-            id: blueInColumn
-            width: 10
-            height: 10
-            color: "#0000ff"
-        }
-    }
-
-    Flow {
-        id: theFlow
-        x: 30
-        y: 30
-        width: 20
-        Rectangle {
-            width: 10
-            height: 10
-            color: "#ff0000"
-            layer.enabled: true
-        }
-
-        Rectangle {
-            width: 10
-            height: 10
-            color: "#ffffff"
-            layer.enabled: true
-            layer.effect: greenPassThrough
-        }
-
-        Rectangle {
-            id: blueInFlow
-            width: 10
-            height: 10
-            color: "#0000ff"
-        }
-    }
-
-    Grid {
-        id: theGrid
-        x: 60
-        y: 10
-        columns: 2
-        Rectangle {
-            width: 10
-            height: 10
-            color: "#ff0000"
-            layer.enabled: true
-        }
-
-        Rectangle {
-            width: 10
-            height: 10
-            color: "#ffffff"
-            layer.enabled: true
-            layer.effect: greenPassThrough
-        }
-
-        Rectangle {
-            id: blueInGrid
-            width: 10
-            height: 10
-            color: "#0000ff"
-        }
-    }
-
-}
diff --git a/tests/auto/qmltest/itemgrabber/tst_itemgrabber.qml b/tests/auto/qmltest/itemgrabber/tst_itemgrabber.qml
deleted file mode 100644
index 743dad70eb..0000000000
--- a/tests/auto/qmltest/itemgrabber/tst_itemgrabber.qml
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Jolla Ltd, author: <gunnar.sletta@jollamobile.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.4
-import QtTest 1.1
-
-Item {
-    id: root;
-    width: 400
-    height: 400
-
-    TestCase {
-        id: testCase
-        name: "item-grabber"
-        when: imageOnDisk.ready && imageOnDiskSmall.ready && imageInCache.ready && imageInCacheSmall.ready
-        function test_endresult() {
-            var image = grabImage(root);
-
-            // imageOnDisk at (0, 0) - (100x100)
-            compare(imageOnDisk.width, 100);
-            compare(imageOnDisk.height, 100);
-            verify(image.pixel(0, 0) === Qt.rgba(1, 0, 0, 1)); // Use verify because compare doesn't support colors (QTBUG-34878)
-            verify(image.pixel(99, 99) === Qt.rgba(0, 0, 1, 1));
-
-            // imageOnDiskSmall at (100, 0) - 50x50
-            compare(imageOnDiskSmall.width, 50);
-            compare(imageOnDiskSmall.height, 50);
-            verify(image.pixel(100, 0) === Qt.rgba(1, 0, 0, 1));
-            verify(image.pixel(149, 49) === Qt.rgba(0, 0, 1, 1));
-
-            // imageInCache at (0, 100) - 100x100
-            compare(imageInCache.width, 100);
-            compare(imageInCache.height, 100);
-            verify(image.pixel(0, 100) === Qt.rgba(1, 0, 0, 1));
-            verify(image.pixel(99, 199) === Qt.rgba(0, 0, 1, 1));
-
-            // imageInCacheSmall at (100, 100) - 50x50
-            compare(imageInCacheSmall.width, 50);
-            compare(imageInCacheSmall.height, 50);
-            verify(image.pixel(100, 100) === Qt.rgba(1, 0, 0, 1));
-            verify(image.pixel(149, 149) === Qt.rgba(0, 0, 1, 1));
-
-            // After all that has been going on, it should only have been called that one time..
-            compare(imageOnDisk.callCount, 1);
-        }
-
-        onWindowShownChanged: {
-            box.grabToImage(imageOnDisk.handleGrab);
-            box.grabToImage(imageOnDiskSmall.handleGrab, Qt.size(50, 50));
-            box.grabToImage(imageInCache.handleGrab);
-            box.grabToImage(imageInCacheSmall.handleGrab, Qt.size(50, 50));
-        }
-
-    }
-
-    Rectangle {
-        id: box
-        width: 100
-        height: 100
-        color: "red";
-
-        visible: false
-
-        Rectangle {
-            anchors.bottom: parent.bottom;
-            anchors.right: parent.right;
-            width: 10
-            height: 10
-            color: "blue";
-        }
-    }
-
-    Image {
-        id: imageOnDisk
-        x: 0
-        y: 0
-        property int callCount: 0;
-        property bool ready: false;
-        function handleGrab(result) {
-            if (!result.saveToFile("image.png"))
-                print("Error: Failed to save image to disk...");
-            source = "image.png";
-            ready = true;
-            ++callCount;
-        }
-    }
-
-    Image {
-        id: imageOnDiskSmall
-        x: 100
-        y: 0
-        property bool ready: false;
-        function handleGrab(result) {
-            if (!result.saveToFile("image_small.png"))
-                print("Error: Failed to save image to disk...");
-            source = "image_small.png";
-            ready = true;
-        }
-    }
-
-    Image {
-        id: imageInCache
-        x: 0
-        y: 100
-        property bool ready: false;
-        function handleGrab(result) {
-            source = result.url;
-            ready = true;
-        }
-    }
-
-    Image {
-        id: imageInCacheSmall
-        x: 100
-        y: 100
-        property bool ready: false;
-        function handleGrab(result) {
-            source = result.url;
-            ready = true;
-        }
-    }
-}
diff --git a/tests/auto/qmltest/listview/tst_listview.qml b/tests/auto/qmltest/listview/tst_listview.qml
index 75429c43e1..98d7ea4cb7 100644
--- a/tests/auto/qmltest/listview/tst_listview.qml
+++ b/tests/auto/qmltest/listview/tst_listview.qml
@@ -288,6 +288,7 @@ Item {
         }
 
         function test_asyncLoaderCurrentIndexChange() {
+            skip("more details in QTBUG-53780")
             for (var i = 0; i < 500; i++) {
                 asyncLoaderCurrentIndexListView.currentIndex = 0;
                 asyncLoaderCurrentIndexListView.currentIndex = 1;
@@ -300,6 +301,7 @@ Item {
         }
 
         function test_asyncListViewLoader() {
+            skip("more details in QTBUG-53780")
             for (var i = 0; i < 50; i++) {
                 wait(10);
                 asyncListViewLoaderView.currentIndex = 0;
diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
index 54db7a78ab..52fd6bf9de 100644
--- a/tests/auto/qmltest/qmltest.pro
+++ b/tests/auto/qmltest/qmltest.pro
@@ -10,5 +10,5 @@ importFiles.files = borderimage  buttonclick  createbenchmark  events  qqmlbindi
 importFiles.path = .
 DEPLOYMENT += importFiles
 
-CONFIG+=insignificant_test # QTBUG-33723
-
+# Please do not make this test insignificant again, thanks.
+# Just skip those unstable ones. See also QTBUG-33723.
diff --git a/tests/auto/qmltest/statemachine/tst_signaltransition.qml b/tests/auto/qmltest/statemachine/tst_signaltransition.qml
new file mode 100644
index 0000000000..0e35207670
--- /dev/null
+++ b/tests/auto/qmltest/statemachine/tst_signaltransition.qml
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Ford Motor Company
+** Copyright (C) 2016 The Qt Company
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite 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 QtTest 1.1
+import QtQml.StateMachine 1.0
+
+TestCase {
+    id: testCase
+    StateMachine {
+        id: machine
+        initialState: startState
+        State {
+            id: startState
+            SignalTransition {
+                id: signalTrans
+                signal: testCase.onMysignal
+                targetState: finalState
+            }
+        }
+        FinalState {
+            id: finalState
+        }
+    }
+
+    SignalSpy {
+        id: finalStateActive
+        target: finalState
+        signalName: "activeChanged"
+    }
+
+    signal mysignal()
+
+    name: "testSignalTransition"
+    function test_signalTransition()
+    {
+        // Start statemachine, should not have reached finalState yet.
+        machine.start()
+        tryCompare(finalStateActive, "count", 0)
+        tryCompare(machine, "running", true)
+
+        testCase.mysignal()
+        tryCompare(finalStateActive, "count", 1)
+        tryCompare(machine, "running", false)
+    }
+}
diff --git a/tests/auto/qmltest/window/tst_clickwindow.qml b/tests/auto/qmltest/window/tst_clickwindow.qml
index bbe091990c..c3577be4dc 100644
--- a/tests/auto/qmltest/window/tst_clickwindow.qml
+++ b/tests/auto/qmltest/window/tst_clickwindow.qml
@@ -75,6 +75,8 @@ Item {
         when: windowShown
 
         function test_clickBothWindows() {
+            if (Qt.platform.os === "linux" || Qt.platform.os === "windows")
+                skip("more details in QTBUG-53785")
             mouseClick(ma, 20, 20);
             verify(ma.everClicked);
             mouseClick(ma2, 20, 20);