Remove qtquickcontrols2 sources and explain where they wentHEADdev

Now that qtquickcontrols2 has been merged into qtdeclarative,
we should make it obvious that this repo should no longer be
used, by preventing it from being built.

Task-number: QTBUG-95173
Pick-to: 6.2
Change-Id: I95bd6a214f3d75a865ab163ee0a1f9ffbeb7a051
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Volker Hilsheimer <[email protected]>

20 files changed, 0 insertions, 1740 deletions

diff --git a/tests/auto/quickcontrols2/palette/CMakeLists.txt b/tests/auto/quickcontrols2/palette/CMakeLists.txt
deleted file mode 100644
index 1a00f799..00000000
--- a/tests/auto/quickcontrols2/palette/CMakeLists.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-# Generated from palette.pro.
-
-#####################################################################
-## tst_palette Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_palette
-    SOURCES
-        ../shared/qtest_quickcontrols.h
-        ../shared/util.cpp ../shared/util.h
-        ../shared/visualtestutil.cpp ../shared/visualtestutil.h
-        tst_palette.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(qmake_immediate_resource_files
-    "qtquickcontrols2.conf"
-)
-
-qt_internal_add_resource(tst_palette "qmake_immediate"
-    PREFIX
-        "/"
-    FILES
-        ${qmake_immediate_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:palette.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_palette CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_palette CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/palette/data/bindings.qml b/tests/auto/quickcontrols2/palette/data/bindings.qml
deleted file mode 100644
index 215fb034..00000000
--- a/tests/auto/quickcontrols2/palette/data/bindings.qml
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 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:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Window
-import QtQuick.Controls
-import QtQuick.Layouts
-
-ApplicationWindow {
-    id: window
-    objectName: "window"
-    width: 600
-    height: 800
-    visible: true
-
-    property alias disabledButton: disabledButton
-    property alias enabledButton: enabledButton
-
-    palette {
-        active {
-            button: "khaki"
-            buttonText: "bisque"
-        }
-
-        inactive {
-            button: "khaki"
-            buttonText: "bisque"
-        }
-
-        disabled {
-            buttonText: "lavender"
-            button: "coral"
-        }
-    }
-
-    ColumnLayout {
-        Button {
-            id: disabledButton
-            text: "Disabled"
-            enabled: false
-
-            palette.disabled.button: "aqua"
-            palette.disabled.buttonText: "azure"
-        }
-
-        Button {
-            id: enabledButton
-            text: "Enabled"
-
-            palette: disabledButton.palette
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-childcontrol.qml b/tests/auto/quickcontrols2/palette/data/inheritance-childcontrol.qml
deleted file mode 100644
index 896354df..00000000
--- a/tests/auto/quickcontrols2/palette/data/inheritance-childcontrol.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-
-    property alias control: control
-    property alias child: child
-    property alias grandChild: grandChild
-
-    Item {
-        Control {
-            id: control
-
-            Control {
-                id: child
-
-                Item {
-                    Control {
-                        id: grandChild
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-childpopup.qml b/tests/auto/quickcontrols2/palette/data/inheritance-childpopup.qml
deleted file mode 100644
index 7896a558..00000000
--- a/tests/auto/quickcontrols2/palette/data/inheritance-childpopup.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-
-    property alias control: control
-    property alias child: child
-    property alias grandChild: grandChild
-
-    Item {
-        Popup {
-            id: control
-
-            Control {
-                id: child
-
-                Item {
-                    Control {
-                        id: grandChild
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-control.qml b/tests/auto/quickcontrols2/palette/data/inheritance-control.qml
deleted file mode 100644
index eb534180..00000000
--- a/tests/auto/quickcontrols2/palette/data/inheritance-control.qml
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-
-    property alias control: control
-    property alias child: child
-    property alias grandChild: grandChild
-
-    Control {
-        id: control
-
-        Control {
-            id: child
-
-            Item {
-                Control {
-                    id: grandChild
-                }
-            }
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildcontrol.qml b/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildcontrol.qml
deleted file mode 100644
index 0a4e5bc6..00000000
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildcontrol.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-
-    property Control control
-    property Control child
-    property Control grandChild
-
-    Item {
-        id: childItem
-    }
-
-    Component {
-        id: component
-        Control { }
-    }
-
-    Component.onCompleted: {
-        control = component.createObject(childItem)
-        child = component.createObject(control)
-        grandChild = component.createObject(child)
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildpopup.qml b/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildpopup.qml
deleted file mode 100644
index 0e799d47..00000000
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildpopup.qml
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-
-    property Popup control
-    property Control child
-    property Control grandChild
-
-    Item {
-        id: childItem
-    }
-
-    Component {
-        id: popupComponent
-        Popup { }
-    }
-
-    Component {
-        id: controlComponent
-        Control { }
-    }
-
-    Component.onCompleted: {
-        control = popupComponent.createObject(childItem)
-        child = controlComponent.createObject(control.contentItem)
-        grandChild = controlComponent.createObject(child)
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamiccontrol.qml b/tests/auto/quickcontrols2/palette/data/inheritance-dynamiccontrol.qml
deleted file mode 100644
index 058d5b8b..00000000
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamiccontrol.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-
-    property Control control
-    property Control child
-    property Control grandChild
-
-    Component {
-        id: component
-        Control { }
-    }
-
-    Component.onCompleted: {
-        control = component.createObject(contentItem)
-        child = component.createObject(control)
-        grandChild = component.createObject(child)
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicpopup.qml b/tests/auto/quickcontrols2/palette/data/inheritance-dynamicpopup.qml
deleted file mode 100644
index 429669c7..00000000
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicpopup.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-
-    property Popup control
-    property Control child
-    property Control grandChild
-
-    Component {
-        id: popupComponent
-        Popup { }
-    }
-
-    Component {
-        id: controlComponent
-        Control { }
-    }
-
-    Component.onCompleted: {
-        control = popupComponent.createObject(window)
-        child = controlComponent.createObject(control.contentItem)
-        grandChild = controlComponent.createObject(child)
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-popup.qml b/tests/auto/quickcontrols2/palette/data/inheritance-popup.qml
deleted file mode 100644
index cd2aebb5..00000000
--- a/tests/auto/quickcontrols2/palette/data/inheritance-popup.qml
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-
-    property alias control: control
-    property alias child: child
-    property alias grandChild: grandChild
-
-    Popup {
-        id: control
-
-        Control {
-            id: child
-
-            Item {
-                Control {
-                    id: grandChild
-                }
-            }
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/data/listview.qml b/tests/auto/quickcontrols2/palette/data/listview.qml
deleted file mode 100644
index eee6531f..00000000
--- a/tests/auto/quickcontrols2/palette/data/listview.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-    width: 200
-    height: 200
-
-    property alias listView: listView
-
-    palette.highlight: "red"
-
-    ListView {
-        id: listView
-        anchors.fill: parent
-        model: 1
-        delegate: Column {
-            property alias control: control
-            property alias label: label
-            property alias textarea: textarea
-            property alias textfield: textfield
-
-            Control { id: control }
-            Label { id: label }
-            TextArea { id: textarea }
-            TextField { id: textfield }
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/data/palette-appwindow-custom.qml b/tests/auto/quickcontrols2/palette/data/palette-appwindow-custom.qml
deleted file mode 100644
index 95f9fde6..00000000
--- a/tests/auto/quickcontrols2/palette/data/palette-appwindow-custom.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-    palette.alternateBase: "aqua"
-    palette.base: "azure"
-    palette.brightText: "beige"
-    palette.button: "bisque"
-    palette.buttonText: "chocolate"
-    palette.dark: "coral"
-    palette.highlight: "crimson"
-    palette.highlightedText: "fuchsia"
-    palette.light: "gold"
-    palette.link: "indigo"
-    palette.linkVisited: "ivory"
-    palette.mid: "khaki"
-    palette.midlight: "lavender"
-    palette.shadow: "linen"
-    palette.text: "moccasin"
-    palette.toolTipBase: "navy"
-    palette.toolTipText: "orchid"
-    palette.window: "plum"
-    palette.windowText: "salmon"
-    palette.placeholderText: "magenta"
-}
diff --git a/tests/auto/quickcontrols2/palette/data/palette-appwindow-default.qml b/tests/auto/quickcontrols2/palette/data/palette-appwindow-default.qml
deleted file mode 100644
index 9f2c34fe..00000000
--- a/tests/auto/quickcontrols2/palette/data/palette-appwindow-default.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-ApplicationWindow {
-}
diff --git a/tests/auto/quickcontrols2/palette/data/palette-control-custom.qml b/tests/auto/quickcontrols2/palette/data/palette-control-custom.qml
deleted file mode 100644
index 7f3bfde5..00000000
--- a/tests/auto/quickcontrols2/palette/data/palette-control-custom.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-Control {
-    palette.alternateBase: "aqua"
-    palette.base: "azure"
-    palette.brightText: "beige"
-    palette.button: "bisque"
-    palette.buttonText: "chocolate"
-    palette.dark: "coral"
-    palette.highlight: "crimson"
-    palette.highlightedText: "fuchsia"
-    palette.light: "gold"
-    palette.link: "indigo"
-    palette.linkVisited: "ivory"
-    palette.mid: "khaki"
-    palette.midlight: "lavender"
-    palette.shadow: "linen"
-    palette.text: "moccasin"
-    palette.toolTipBase: "navy"
-    palette.toolTipText: "orchid"
-    palette.window: "plum"
-    palette.windowText: "salmon"
-    palette.placeholderText: "magenta"
-}
diff --git a/tests/auto/quickcontrols2/palette/data/palette-control-default.qml b/tests/auto/quickcontrols2/palette/data/palette-control-default.qml
deleted file mode 100644
index 48afa021..00000000
--- a/tests/auto/quickcontrols2/palette/data/palette-control-default.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-Control {
-}
diff --git a/tests/auto/quickcontrols2/palette/data/palette-popup-custom.qml b/tests/auto/quickcontrols2/palette/data/palette-popup-custom.qml
deleted file mode 100644
index 6f35f452..00000000
--- a/tests/auto/quickcontrols2/palette/data/palette-popup-custom.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-Popup {
-    palette.alternateBase: "aqua"
-    palette.base: "azure"
-    palette.brightText: "beige"
-    palette.button: "bisque"
-    palette.buttonText: "chocolate"
-    palette.dark: "coral"
-    palette.highlight: "crimson"
-    palette.highlightedText: "fuchsia"
-    palette.light: "gold"
-    palette.link: "indigo"
-    palette.linkVisited: "ivory"
-    palette.mid: "khaki"
-    palette.midlight: "lavender"
-    palette.shadow: "linen"
-    palette.text: "moccasin"
-    palette.toolTipBase: "navy"
-    palette.toolTipText: "orchid"
-    palette.window: "plum"
-    palette.windowText: "salmon"
-    palette.placeholderText: "magenta"
-}
diff --git a/tests/auto/quickcontrols2/palette/data/palette-popup-default.qml b/tests/auto/quickcontrols2/palette/data/palette-popup-default.qml
deleted file mode 100644
index 77676bac..00000000
--- a/tests/auto/quickcontrols2/palette/data/palette-popup-default.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-Popup {
-}
diff --git a/tests/auto/quickcontrols2/palette/data/set-palette.qml b/tests/auto/quickcontrols2/palette/data/set-palette.qml
deleted file mode 100644
index 2d0fe194..00000000
--- a/tests/auto/quickcontrols2/palette/data/set-palette.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 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:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-Control {
-    palette {
-        active {
-            buttonText: "azure"
-            button: "khaki"
-        }
-
-        disabled {
-            buttonText: "lavender"
-            button: "coral"
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/palette/qtquickcontrols2.conf b/tests/auto/quickcontrols2/palette/qtquickcontrols2.conf
deleted file mode 100644
index c5de6b36..00000000
--- a/tests/auto/quickcontrols2/palette/qtquickcontrols2.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[Basic]
-Palette\Base=#efefef
-
-[Basic\Palette]
-Text=#101010
diff --git a/tests/auto/quickcontrols2/palette/tst_palette.cpp b/tests/auto/quickcontrols2/palette/tst_palette.cpp
deleted file mode 100644
index d8e1a3bf..00000000
--- a/tests/auto/quickcontrols2/palette/tst_palette.cpp
+++ /dev/null
@@ -1,436 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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:LGPL3$
-** 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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/qtest.h>
-#include "../shared/visualtestutil.h"
-
-#include <QtGui/qpalette.h>
-#include <QtGui/private/qguiapplication_p.h>
-#include <QtQml/qqmlengine.h>
-#include <QtQml/qqmlcomponent.h>
-#include <QtQuick/private/qquickitem_p.h>
-#include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
-#include <QtQuickTemplates2/private/qquickcontrol_p.h>
-#include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
-#include <QtQuickTemplates2/private/qquickpopup_p.h>
-#include <QtQuickTemplates2/private/qquickpopup_p_p.h>
-#include <QtQuickTemplates2/private/qquicktheme_p_p.h>
-#include <QtQuickTemplates2/private/qquickbutton_p.h>
-
-using namespace QQuickVisualTestUtil;
-
-// Need a more descriptive failure message: QTBUG-87039
-#define COMPARE_PALETTES(actualPalette, expectedPalette) \
-    QVERIFY2(actualPalette == expectedPalette, \
-        qPrintable(QString::fromLatin1("\n   Actual:    %1\n   Expected:  %2") \
-            .arg(QDebug::toString(actualPalette)).arg(QDebug::toString(expectedPalette))));
-
-class tst_palette : public QQmlDataTest
-{
-    Q_OBJECT
-
-private slots:
-    void initTestCase() override;
-
-    void palette_data();
-    void palette();
-
-    void inheritance_data();
-    void inheritance();
-
-    void defaultPalette_data();
-    void defaultPalette();
-
-    void listView_data();
-    void listView();
-
-    void setDynamicallyCreatedPalette();
-    void createBindings();
-    void updateBindings();
-};
-
-void tst_palette::initTestCase()
-{
-    QQuickStyle::setStyle("Basic");
-
-    QQmlDataTest::initTestCase();
-
-    // Import QtQuick.Controls to initialize styles and themes so that
-    // QQuickControlPrivate::themePalette() returns a palette from the
-    // style's theme instead of the platform's theme.
-    QQmlEngine engine;
-    QQmlComponent component(&engine);
-    component.setData("import QtQuick.Controls; Control { }", QUrl());
-    delete component.create();
-}
-
-void tst_palette::palette_data()
-{
-    QTest::addColumn<QString>("testFile");
-    QTest::addColumn<QPalette>("expectedPalette");
-
-    QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::System);
-    defaultPalette.setColor(QPalette::Base, QColor("#efefef"));
-    defaultPalette.setColor(QPalette::Text, QColor("#101010"));
-
-    QTest::newRow("Control") << "palette-control-default.qml" << defaultPalette;
-    QTest::newRow("AppWindow") << "palette-appwindow-default.qml" << defaultPalette;
-    QTest::newRow("Popup") << "palette-popup-default.qml" << defaultPalette;
-
-    QPalette customPalette;
-    customPalette.setColor(QPalette::AlternateBase, QColor("aqua"));
-    customPalette.setColor(QPalette::Base, QColor("azure"));
-    customPalette.setColor(QPalette::BrightText, QColor("beige"));
-    customPalette.setColor(QPalette::Button, QColor("bisque"));
-    customPalette.setColor(QPalette::ButtonText, QColor("chocolate"));
-    customPalette.setColor(QPalette::Dark, QColor("coral"));
-    customPalette.setColor(QPalette::Highlight, QColor("crimson"));
-    customPalette.setColor(QPalette::HighlightedText, QColor("fuchsia"));
-    customPalette.setColor(QPalette::Light, QColor("gold"));
-    customPalette.setColor(QPalette::Link, QColor("indigo"));
-    customPalette.setColor(QPalette::LinkVisited, QColor("ivory"));
-    customPalette.setColor(QPalette::Mid, QColor("khaki"));
-    customPalette.setColor(QPalette::Midlight, QColor("lavender"));
-    customPalette.setColor(QPalette::Shadow, QColor("linen"));
-    customPalette.setColor(QPalette::Text, QColor("moccasin"));
-    customPalette.setColor(QPalette::ToolTipBase, QColor("navy"));
-    customPalette.setColor(QPalette::ToolTipText, QColor("orchid"));
-    customPalette.setColor(QPalette::Window, QColor("plum"));
-    customPalette.setColor(QPalette::WindowText, QColor("salmon"));
-    customPalette.setColor(QPalette::PlaceholderText, QColor("magenta"));
-
-    QTest::newRow("Control:custom") << "palette-control-custom.qml" << customPalette;
-    QTest::newRow("AppWindow:custom") << "palette-appwindow-custom.qml" << customPalette;
-    QTest::newRow("Popup:custom") << "palette-popup-custom.qml" << customPalette;
-}
-
-void tst_palette::palette()
-{
-    QFETCH(QString, testFile);
-    QFETCH(QPalette, expectedPalette);
-
-    QQmlEngine engine;
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl(testFile));
-
-    QScopedPointer<QObject> object(component.create());
-    QVERIFY2(!object.isNull(), qPrintable(component.errorString()));
-
-    QVariant var = object->property("palette");
-    QVERIFY(var.isValid());
-
-    COMPARE_PALETTES(var.value<QQuickPalette*>()->toQPalette(), expectedPalette);
-}
-
-void tst_palette::inheritance_data()
-{
-    QTest::addColumn<QString>("testFile");
-
-    QTest::newRow("Control") << "inheritance-control.qml";
-    QTest::newRow("Child Control") << "inheritance-childcontrol.qml";
-    QTest::newRow("Dynamic Control") << "inheritance-dynamiccontrol.qml";
-    QTest::newRow("Dynamic Child Control") << "inheritance-dynamicchildcontrol.qml";
-
-    QTest::newRow("Popup") << "inheritance-popup.qml";
-    QTest::newRow("Child Popup") << "inheritance-childpopup.qml";
-    QTest::newRow("Dynamic Popup") << "inheritance-dynamicpopup.qml";
-    QTest::newRow("Dynamic Child Popup") << "inheritance-dynamicchildpopup.qml";
-}
-
-void tst_palette::inheritance()
-{
-    QFETCH(QString, testFile);
-
-    QQmlEngine engine;
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl(testFile));
-
-    QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(component.create()));
-    QVERIFY2(!window.isNull(), qPrintable(component.errorString()));
-
-    QObject *control = window->property("control").value<QObject *>();
-    QObject *child = window->property("child").value<QObject *>();
-    QObject *grandChild = window->property("grandChild").value<QObject *>();
-    QVERIFY(control && child && grandChild);
-
-    QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::System);
-    defaultPalette.setColor(QPalette::Base, QColor("#efefef"));
-    defaultPalette.setColor(QPalette::Text, QColor("#101010"));
-
-    auto windowPalette = QQuickWindowPrivate::get(window.get())->palette();
-
-    QCOMPARE(windowPalette->toQPalette(), defaultPalette);
-
-    auto controlPalette = control->property("palette").value<QQuickPalette*>();
-    auto childPalette = child->property("palette").value<QQuickPalette*>();
-    auto grandChildPalette = grandChild->property("palette").value<QQuickPalette*>();
-    QVERIFY(controlPalette && childPalette && grandChildPalette);
-
-    QCOMPARE(controlPalette->toQPalette(), defaultPalette);
-    QCOMPARE(childPalette->toQPalette(), defaultPalette);
-    QCOMPARE(grandChildPalette->toQPalette(), defaultPalette);
-
-    childPalette->setBase(Qt::red);
-    childPalette->setText(Qt::green);
-    childPalette->setButton(Qt::blue);
-
-    QCOMPARE(childPalette->base(), grandChildPalette->base());
-    QCOMPARE(childPalette->text(), grandChildPalette->text());
-    QCOMPARE(childPalette->button(), grandChildPalette->button());
-
-    windowPalette->setWindow(Qt::gray);
-    QCOMPARE(controlPalette->window(), windowPalette->window());
-
-    childPalette->setWindow(Qt::red);
-    QCOMPARE(childPalette->window(), Qt::red);
-
-    grandChildPalette->setWindow(Qt::blue);
-    QCOMPARE(grandChildPalette->window(), Qt::blue);
-
-    auto childMo = child->metaObject();
-    childMo->property(childMo->indexOfProperty("palette")).reset(child);
-    QCOMPARE(childPalette->window(), windowPalette->window());
-    QCOMPARE(grandChildPalette->window(), Qt::blue);
-
-    auto grandChildMo = grandChild->metaObject();
-    grandChildMo->property(grandChildMo->indexOfProperty("palette")).reset(grandChild);
-    QCOMPARE(grandChildPalette->window(), windowPalette->window());
-}
-
-class TestTheme : public QQuickTheme
-{
-public:
-    static const uint NPalettes = QQuickTheme::Tumbler + 1;
-
-    TestTheme()
-    {
-        for (uint i = 0; i < NPalettes; ++i)
-            setPalette(static_cast<Scope>(i), QPalette(QColor::fromRgb(i)));
-    }
-};
-
-Q_DECLARE_METATYPE(QQuickTheme::Scope)
-
-void tst_palette::defaultPalette_data()
-{
-    QTest::addColumn<QString>("control");
-    QTest::addColumn<QQuickTheme::Scope>("scope");
-
-    QTest::newRow("AbstractButton") << "AbstractButton" << QQuickTheme::System;
-    QTest::newRow("ApplicationWindow") << "ApplicationWindow" << QQuickTheme::System;
-    QTest::newRow("Button") << "Button" << QQuickTheme::Button;
-    QTest::newRow("CheckBox") << "CheckBox" << QQuickTheme::CheckBox;
-    QTest::newRow("CheckDelegate") << "CheckDelegate" << QQuickTheme::ListView;
-    QTest::newRow("ComboBox") << "ComboBox" << QQuickTheme::ComboBox;
-    QTest::newRow("Container") << "Container" << QQuickTheme::System;
-    QTest::newRow("Control") << "Control" << QQuickTheme::System;
-    QTest::newRow("Dial") << "Dial" << QQuickTheme::System;
-    QTest::newRow("Dialog") << "Dialog" << QQuickTheme::System;
-    QTest::newRow("DialogButtonBox") << "DialogButtonBox" << QQuickTheme::System;
-    QTest::newRow("Drawer") << "Drawer" << QQuickTheme::System;
-    QTest::newRow("Frame") << "Frame" << QQuickTheme::System;
-    QTest::newRow("GroupBox") << "GroupBox" << QQuickTheme::GroupBox;
-    QTest::newRow("ItemDelegate") << "ItemDelegate" << QQuickTheme::ItemView;
-    QTest::newRow("Label") << "Label" << QQuickTheme::Label;
-    QTest::newRow("Menu") << "Menu" << QQuickTheme::Menu;
-    QTest::newRow("MenuItem") << "MenuItem" << QQuickTheme::Menu;
-    QTest::newRow("MenuSeparator") << "MenuSeparator" << QQuickTheme::Menu;
-    QTest::newRow("Page") << "Page" << QQuickTheme::System;
-    QTest::newRow("Pane") << "Pane" << QQuickTheme::System;
-    QTest::newRow("Popup") << "Popup" << QQuickTheme::System;
-    QTest::newRow("ProgressBar") << "ProgressBar" << QQuickTheme::System;
-    QTest::newRow("RadioButton") << "RadioButton" << QQuickTheme::RadioButton;
-    QTest::newRow("RadioDelegate") << "RadioDelegate" << QQuickTheme::ListView;
-    QTest::newRow("RangeSlider") << "RangeSlider" << QQuickTheme::System;
-    QTest::newRow("RoundButton") << "RoundButton" << QQuickTheme::Button;
-    QTest::newRow("ScrollBar") << "ScrollBar" << QQuickTheme::System;
-    QTest::newRow("ScrollIndicator") << "ScrollIndicator" << QQuickTheme::System;
-    QTest::newRow("Slider") << "Slider" << QQuickTheme::System;
-    QTest::newRow("SpinBox") << "SpinBox" << QQuickTheme::SpinBox;
-    QTest::newRow("SwipeDelegate") << "SwipeDelegate" << QQuickTheme::ListView;
-    QTest::newRow("Switch") << "Switch" << QQuickTheme::Switch;
-    QTest::newRow("SwitchDelegate") << "SwitchDelegate" << QQuickTheme::ListView;
-    QTest::newRow("TabBar") << "TabBar" << QQuickTheme::TabBar;
-    QTest::newRow("TabButton") << "TabButton" << QQuickTheme::TabBar;
-    QTest::newRow("TextArea") << "TextArea" << QQuickTheme::TextArea;
-    QTest::newRow("TextField") << "TextField" << QQuickTheme::TextField;
-    QTest::newRow("ToolBar") << "ToolBar" << QQuickTheme::ToolBar;
-    QTest::newRow("ToolButton") << "ToolButton" << QQuickTheme::ToolBar;
-    QTest::newRow("ToolSeparator") << "ToolSeparator" << QQuickTheme::ToolBar;
-    QTest::newRow("ToolTip") << "ToolTip" << QQuickTheme::ToolTip;
-    QTest::newRow("Tumbler") << "Tumbler" << QQuickTheme::Tumbler;
-}
-
-void tst_palette::defaultPalette()
-{
-    QFETCH(QString, control);
-    QFETCH(QQuickTheme::Scope, scope);
-
-    QQmlEngine engine;
-    QQmlComponent component(&engine);
-    component.setData(QString("import QtQuick.Controls; %1 { }").arg(control).toUtf8(), QUrl());
-
-    // The call to setData() above causes QQuickBasicTheme to be set as the current theme,
-    // so we must make sure we only set our theme afterwards.
-    std::unique_ptr<QQuickTheme> oldTheme(QQuickThemePrivate::instance.release());
-    QQuickThemePrivate::instance.reset(new TestTheme);
-
-    QScopedPointer<QObject> object(component.create());
-    QVERIFY2(!object.isNull(), qPrintable(component.errorString()));
-
-    QVariant var = object->property("palette");
-    QVERIFY(var.isValid());
-
-    QPalette expectedPalette = QQuickTheme::palette(scope);
-    auto actualPalette = var.value<QQuickPalette*>();
-    QVERIFY(actualPalette);
-    QCOMPARE(actualPalette->toQPalette(), expectedPalette);
-
-    QQuickThemePrivate::instance.reset(oldTheme.release());
-}
-
-void tst_palette::listView_data()
-{
-    QTest::addColumn<QString>("objectName");
-
-    QTest::newRow("Control") << "control";
-    QTest::newRow("Label") << "label";
-    QTest::newRow("TextArea") << "textarea";
-    QTest::newRow("TextField") << "textfield";
-}
-
-void tst_palette::listView()
-{
-    QFETCH(QString, objectName);
-
-    QQmlEngine engine;
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl("listview.qml"));
-
-    QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(component.create()));
-    QVERIFY2(!window.isNull(), qPrintable(component.errorString()));
-
-    window->show();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-
-    QQuickItem *listView = window->property("listView").value<QQuickItem *>();
-    QVERIFY(listView);
-
-    QQuickItem *contentItem = listView->property("contentItem").value<QQuickItem *>();
-    QVERIFY(contentItem);
-
-    QVERIFY(QMetaObject::invokeMethod(listView, "forceLayout"));
-
-    QQuickItem *column = contentItem->childItems().value(0);
-    QVERIFY(column);
-
-    QQuickItem *control = column->property(objectName.toUtf8()).value<QQuickItem *>();
-    QVERIFY(control);
-
-    QCOMPARE(QQuickItemPrivate::get(control)->palette()->highlight(), Qt::red);
-}
-
-void tst_palette::setDynamicallyCreatedPalette()
-{
-    QQmlEngine engine;
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl("set-palette.qml"));
-
-    QScopedPointer<QObject> object(component.create());
-    QVERIFY2(!object.isNull(), qPrintable(component.errorString()));
-
-    QVariant var = object->property("palette");
-    QVERIFY(var.isValid());
-
-    auto palette = var.value<QQuickPalette*>();
-    QVERIFY(palette);
-
-    QCOMPARE(palette->buttonText(), QColor("azure"));
-    QCOMPARE(palette->button(), QColor("khaki"));
-
-    QCOMPARE(palette->disabled()->buttonText(), QColor("lavender"));
-    QCOMPARE(palette->disabled()->button(), QColor("coral"));
-}
-
-void tst_palette::createBindings()
-{
-    QQmlEngine engine;
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl("bindings.qml"));
-
-    QScopedPointer<QObject> window(component.create());
-    QVERIFY2(!window.isNull(), qPrintable(component.errorString()));
-
-    auto disabledButton = window->property("disabledButton").value<QQuickButton*>();
-    QVERIFY(disabledButton);
-
-    auto enabledButton = window->property("enabledButton").value<QQuickButton*>();
-    QVERIFY(enabledButton);
-
-    QCOMPARE(QQuickItemPrivate::get(disabledButton)->palette()->button(), QColor("aqua"));
-    QCOMPARE(QQuickItemPrivate::get(disabledButton)->palette()->buttonText(), QColor("azure"));
-
-    QCOMPARE(QQuickItemPrivate::get(enabledButton)->palette()->button(), QColor("khaki"));
-    QCOMPARE(QQuickItemPrivate::get(enabledButton)->palette()->buttonText(), QColor("bisque"));
-
-    QCOMPARE(QQuickItemPrivate::get(enabledButton)->palette()->disabled()->button(), QColor("aqua"));
-    QCOMPARE(QQuickItemPrivate::get(enabledButton)->palette()->disabled()->buttonText(), QColor("azure"));
-}
-
-void tst_palette::updateBindings()
-{
-    QQmlEngine engine;
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl("bindings.qml"));
-
-    QScopedPointer<QObject> window(component.create());
-    QVERIFY2(!window.isNull(), qPrintable(component.errorString()));
-
-    auto disabledButton = window->property("disabledButton").value<QQuickButton*>();
-    QVERIFY(disabledButton);
-
-    auto enabledButton = window->property("enabledButton").value<QQuickButton*>();
-    QVERIFY(enabledButton);
-
-    QQuickItemPrivate::get(disabledButton)->palette()->disabled()->setButton(QColor("navy"));
-    enabledButton->setEnabled(false);
-
-    QCOMPARE(QQuickItemPrivate::get(enabledButton)->palette()->button(), QColor("navy"));
-}
-
-QTEST_MAIN(tst_palette)
-
-#include "tst_palette.moc"