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 <alexandru.croitor@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

90 files changed, 0 insertions, 921 deletions

diff --git a/tests/auto/quickcontrols2/accessibility/BLACKLIST b/tests/auto/quickcontrols2/accessibility/BLACKLIST
deleted file mode 100644
index fe7a87f8..00000000
--- a/tests/auto/quickcontrols2/accessibility/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[a11y:Label]
-opensuse-leap
diff --git a/tests/auto/quickcontrols2/accessibility/CMakeLists.txt b/tests/auto/quickcontrols2/accessibility/CMakeLists.txt
deleted file mode 100644
index dafca24b..00000000
--- a/tests/auto/quickcontrols2/accessibility/CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-# Generated from accessibility.pro.
-
-if(NOT QT_FEATURE_accessibility)
-    return()
-endif()
-
-#####################################################################
-## tst_accessibility 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_accessibility
-    SOURCES
-        ../shared/qtest_quickcontrols.h
-        ../shared/util.cpp ../shared/util.h
-        ../shared/visualtestutil.cpp ../shared/visualtestutil.h
-        tst_accessibility.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}
-)
-
-#### Keys ignored in scope 1:.:.:accessibility.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-# _REQUIREMENTS = "qtConfig(accessibility)"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_accessibility CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/abstractbutton.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/abstractbutton.qml
deleted file mode 100644
index 29d6b3c0..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/abstractbutton.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-AbstractButton {
-    text: "AbstractButton"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/busyindicator.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/busyindicator.qml
deleted file mode 100644
index baaa9ba8..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/busyindicator.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-BusyIndicator { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/button.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/button.qml
deleted file mode 100644
index 0359b3ac..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/button.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Button {
-    text: "Button"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/checkbox.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/checkbox.qml
deleted file mode 100644
index c912be57..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/checkbox.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-CheckBox {
-    text: "CheckBox"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/checkdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/checkdelegate.qml
deleted file mode 100644
index df62bc89..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/checkdelegate.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-CheckDelegate {
-    text: "CheckDelegate"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/combobox.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/combobox.qml
deleted file mode 100644
index bfeac723..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/combobox.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ComboBox {
-    model: ["ComboBox"]
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/container.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/container.qml
deleted file mode 100644
index 7d29fec4..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/container.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Container { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/control.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/control.qml
deleted file mode 100644
index 280cfd29..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/control.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Control { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/dial.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/dial.qml
deleted file mode 100644
index d7e700b5..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/dial.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Dial { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/dialog.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/dialog.qml
deleted file mode 100644
index d88fd36d..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/dialog.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Dialog {
-    title: "Dialog"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/drawer.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/drawer.qml
deleted file mode 100644
index 60a35171..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/drawer.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Drawer { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/frame.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/frame.qml
deleted file mode 100644
index b70ccb55..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/frame.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Frame { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/groupbox.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/groupbox.qml
deleted file mode 100644
index 24f3a294..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/groupbox.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-GroupBox {
-    title: "GroupBox"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/itemdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/itemdelegate.qml
deleted file mode 100644
index 5ec95fe0..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/itemdelegate.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ItemDelegate {
-    text: "ItemDelegate"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/label.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/label.qml
deleted file mode 100644
index 5f6a98cd..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/label.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Label {
-    text: "Label"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/menu.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/menu.qml
deleted file mode 100644
index 07fef728..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/menu.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Menu { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/menuitem.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/menuitem.qml
deleted file mode 100644
index 194fa988..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/menuitem.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-MenuItem {
-    text: "MenuItem"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/page.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/page.qml
deleted file mode 100644
index cd1f78e1..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/page.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Page {
-    title: "Page"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/pageindicator.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/pageindicator.qml
deleted file mode 100644
index d64d5657..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/pageindicator.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-PageIndicator { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/pane.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/pane.qml
deleted file mode 100644
index 765c98a3..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/pane.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Pane { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/popup.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/popup.qml
deleted file mode 100644
index c599bd4c..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/popup.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Popup { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/progressbar.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/progressbar.qml
deleted file mode 100644
index b3e287c3..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/progressbar.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ProgressBar {
-    from: 0
-    to: 100
-    value: 50
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/radiobutton.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/radiobutton.qml
deleted file mode 100644
index d796b37e..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/radiobutton.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-RadioButton {
-    text: "RadioButton"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/radiodelegate.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/radiodelegate.qml
deleted file mode 100644
index d002b985..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/radiodelegate.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-RadioDelegate {
-    text: "RadioDelegate"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/rangeslider.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/rangeslider.qml
deleted file mode 100644
index 7bd364c4..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/rangeslider.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-RangeSlider {
-    from: 0
-    to: 100
-    first.value: 25
-    second.value: 75
-    stepSize: 1
-    orientation: Qt.Horizontal
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/roundbutton.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/roundbutton.qml
deleted file mode 100644
index 6c78c0a4..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/roundbutton.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-RoundButton {
-    text: "RoundButton"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollbar.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/scrollbar.qml
deleted file mode 100644
index c36b1534..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollbar.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ScrollBar { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollindicator.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/scrollindicator.qml
deleted file mode 100644
index 5b2f44b6..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollindicator.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ScrollIndicator { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/slider.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/slider.qml
deleted file mode 100644
index fd60a198..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/slider.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Slider {
-    from: 0
-    to: 100
-    value: 50
-    stepSize: 1
-    orientation: Qt.Horizontal
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/spinbox.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/spinbox.qml
deleted file mode 100644
index 159e1f46..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/spinbox.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-SpinBox {
-    from: 0
-    to: 100
-    value: 50
-    stepSize: 1
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/stackview.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/stackview.qml
deleted file mode 100644
index bd540b91..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/stackview.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-StackView { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/swipedelegate.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/swipedelegate.qml
deleted file mode 100644
index d3724d4d..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/swipedelegate.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-SwipeDelegate {
-    text: "SwipeDelegate"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/swipeview.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/swipeview.qml
deleted file mode 100644
index 9eb82216..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/swipeview.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-SwipeView { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/switch.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/switch.qml
deleted file mode 100644
index 00213086..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/switch.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Switch {
-    text: "Switch"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/switchdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/switchdelegate.qml
deleted file mode 100644
index 9f71ed68..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/switchdelegate.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-SwitchDelegate {
-    text: "SwitchDelegate"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbar.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/tabbar.qml
deleted file mode 100644
index 423bfea9..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbar.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-TabBar { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbutton.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/tabbutton.qml
deleted file mode 100644
index ab9ea8ae..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbutton.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-TabButton {
-    text: "TabButton"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/textarea.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/textarea.qml
deleted file mode 100644
index 9a1f31d0..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/textarea.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-TextArea {
-    text: "TextArea"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/textfield.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/textfield.qml
deleted file mode 100644
index 42a16bae..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/textfield.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-TextField {
-    text: "TextField"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbar.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/toolbar.qml
deleted file mode 100644
index 01b93d7d..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbar.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ToolBar { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbutton.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/toolbutton.qml
deleted file mode 100644
index 40e1152e..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbutton.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ToolButton {
-    text: "ToolButton"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tooltip.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/tooltip.qml
deleted file mode 100644
index f1c3cebe..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tooltip.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ToolTip {
-    text: "ToolTip"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tumbler.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/tumbler.qml
deleted file mode 100644
index e3db175b..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tumbler.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Tumbler { }
diff --git a/tests/auto/quickcontrols2/accessibility/data/ordering/page.qml b/tests/auto/quickcontrols2/accessibility/data/ordering/page.qml
deleted file mode 100644
index 8efafe32..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/ordering/page.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Page {
-    title: "Page"
-    Accessible.role: Accessible.Pane
-
-    header: Label {
-        text: "Header"
-    }
-
-    footer: Label {
-        text: "Footer"
-    }
-
-    Label {
-        text: "Content item 1"
-    }
-
-    Label {
-        text: "Content item 2"
-    }
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/abstractbutton.qml b/tests/auto/quickcontrols2/accessibility/data/override/abstractbutton.qml
deleted file mode 100644
index ac8efe26..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/abstractbutton.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-AbstractButton {
-    text: "AbstractButton"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/busyindicator.qml b/tests/auto/quickcontrols2/accessibility/data/override/busyindicator.qml
deleted file mode 100644
index 439788d1..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/busyindicator.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-BusyIndicator {
-    Accessible.name: "BusyIndicatorOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/button.qml b/tests/auto/quickcontrols2/accessibility/data/override/button.qml
deleted file mode 100644
index 578af86c..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/button.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Button {
-    text: "Button"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/checkbox.qml b/tests/auto/quickcontrols2/accessibility/data/override/checkbox.qml
deleted file mode 100644
index 5df73509..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/checkbox.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-CheckBox {
-    text: "CheckBox"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/checkdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/override/checkdelegate.qml
deleted file mode 100644
index 43f65d50..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/checkdelegate.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-CheckDelegate {
-    text: "CheckDelegate"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/combobox.qml b/tests/auto/quickcontrols2/accessibility/data/override/combobox.qml
deleted file mode 100644
index fa6ed3b4..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/combobox.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ComboBox {
-    model: ["ComboBox"]
-    Accessible.name: model[0] + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/container.qml b/tests/auto/quickcontrols2/accessibility/data/override/container.qml
deleted file mode 100644
index 4e73f341..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/container.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Container {
-    Accessible.name: "ContainerOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/control.qml b/tests/auto/quickcontrols2/accessibility/data/override/control.qml
deleted file mode 100644
index 9c2be461..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/control.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Control {
-    Accessible.name: "ControlOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/dial.qml b/tests/auto/quickcontrols2/accessibility/data/override/dial.qml
deleted file mode 100644
index 8dbf0e37..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/dial.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Dial {
-    Accessible.name: "DialOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/dialog.qml b/tests/auto/quickcontrols2/accessibility/data/override/dialog.qml
deleted file mode 100644
index d1f31971..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/dialog.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Dialog {
-    title: "Dialog"
-    Accessible.name: title + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/drawer.qml b/tests/auto/quickcontrols2/accessibility/data/override/drawer.qml
deleted file mode 100644
index 02e973e2..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/drawer.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Drawer {
-    Accessible.name: "DrawerOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/frame.qml b/tests/auto/quickcontrols2/accessibility/data/override/frame.qml
deleted file mode 100644
index 55086b35..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/frame.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Frame {
-    Accessible.name: "FrameOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/groupbox.qml b/tests/auto/quickcontrols2/accessibility/data/override/groupbox.qml
deleted file mode 100644
index d09d0845..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/groupbox.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-GroupBox {
-    title: "GroupBox"
-    Accessible.name: title + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/itemdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/override/itemdelegate.qml
deleted file mode 100644
index 2f32cb75..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/itemdelegate.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ItemDelegate {
-    text: "ItemDelegate"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/label.qml b/tests/auto/quickcontrols2/accessibility/data/override/label.qml
deleted file mode 100644
index 5c1310f8..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/label.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Label {
-    text: "Label"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/menu.qml b/tests/auto/quickcontrols2/accessibility/data/override/menu.qml
deleted file mode 100644
index 57a1b3d6..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/menu.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Menu {
-    Accessible.name: "MenuOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/menuitem.qml b/tests/auto/quickcontrols2/accessibility/data/override/menuitem.qml
deleted file mode 100644
index e1c064f3..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/menuitem.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-MenuItem {
-    text: "MenuItem"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/page.qml b/tests/auto/quickcontrols2/accessibility/data/override/page.qml
deleted file mode 100644
index b3b87e8a..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/page.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Page {
-    title: "Page"
-    Accessible.name: title + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/pageindicator.qml b/tests/auto/quickcontrols2/accessibility/data/override/pageindicator.qml
deleted file mode 100644
index f366464d..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/pageindicator.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-PageIndicator {
-    Accessible.name: "PageIndicatorOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/pane.qml b/tests/auto/quickcontrols2/accessibility/data/override/pane.qml
deleted file mode 100644
index 7b57e9a9..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/pane.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Pane {
-    Accessible.name: "PaneOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/popup.qml b/tests/auto/quickcontrols2/accessibility/data/override/popup.qml
deleted file mode 100644
index 9d8d5855..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/popup.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Popup {
-    Accessible.name: "PopupOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/progressbar.qml b/tests/auto/quickcontrols2/accessibility/data/override/progressbar.qml
deleted file mode 100644
index 58bd2ae1..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/progressbar.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ProgressBar {
-    from: 0
-    to: 100
-    value: 50
-
-    Accessible.name: "ProgressBarOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/radiobutton.qml b/tests/auto/quickcontrols2/accessibility/data/override/radiobutton.qml
deleted file mode 100644
index 3c555256..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/radiobutton.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-RadioButton {
-    text: "RadioButton"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/radiodelegate.qml b/tests/auto/quickcontrols2/accessibility/data/override/radiodelegate.qml
deleted file mode 100644
index 883f963c..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/radiodelegate.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-RadioDelegate {
-    text: "RadioDelegate"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/rangeslider.qml b/tests/auto/quickcontrols2/accessibility/data/override/rangeslider.qml
deleted file mode 100644
index 675c34aa..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/rangeslider.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-RangeSlider {
-    from: 0
-    to: 100
-    first.value: 25
-    second.value: 75
-    stepSize: 1
-    orientation: Qt.Horizontal
-
-    Accessible.name: "RangeSliderOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/roundbutton.qml b/tests/auto/quickcontrols2/accessibility/data/override/roundbutton.qml
deleted file mode 100644
index a793ee28..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/roundbutton.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-RoundButton {
-    text: "RoundButton"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/scrollbar.qml b/tests/auto/quickcontrols2/accessibility/data/override/scrollbar.qml
deleted file mode 100644
index 6b3e613c..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/scrollbar.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ScrollBar {
-    Accessible.name: "ScrollBarOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/scrollindicator.qml b/tests/auto/quickcontrols2/accessibility/data/override/scrollindicator.qml
deleted file mode 100644
index 5cc1e5d4..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/scrollindicator.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ScrollIndicator {
-    Accessible.name: "ScrollIndicatorOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/slider.qml b/tests/auto/quickcontrols2/accessibility/data/override/slider.qml
deleted file mode 100644
index 9239f8db..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/slider.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Slider {
-    from: 0
-    to: 100
-    value: 50
-    stepSize: 1
-    orientation: Qt.Horizontal
-    Accessible.name: "SliderOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/spinbox.qml b/tests/auto/quickcontrols2/accessibility/data/override/spinbox.qml
deleted file mode 100644
index 327f2a6d..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/spinbox.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-SpinBox {
-    from: 0
-    to: 100
-    value: 50
-    stepSize: 1
-    Accessible.name: "SpinBoxOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/stackview.qml b/tests/auto/quickcontrols2/accessibility/data/override/stackview.qml
deleted file mode 100644
index dd3b8342..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/stackview.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-StackView {
-    Accessible.name: "StackViewOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/swipedelegate.qml b/tests/auto/quickcontrols2/accessibility/data/override/swipedelegate.qml
deleted file mode 100644
index bc97fc93..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/swipedelegate.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-SwipeDelegate {
-    text: "SwipeDelegate"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/swipeview.qml b/tests/auto/quickcontrols2/accessibility/data/override/swipeview.qml
deleted file mode 100644
index 809b5362..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/swipeview.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-SwipeView {
-    Accessible.name: "SwipeViewOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/switch.qml b/tests/auto/quickcontrols2/accessibility/data/override/switch.qml
deleted file mode 100644
index 18e3eb70..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/switch.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Switch {
-    text: "Switch"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/switchdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/override/switchdelegate.qml
deleted file mode 100644
index 0c66f9e9..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/switchdelegate.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-SwitchDelegate {
-    text: "SwitchDelegate"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tabbar.qml b/tests/auto/quickcontrols2/accessibility/data/override/tabbar.qml
deleted file mode 100644
index a959f68c..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/tabbar.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-TabBar {
-    Accessible.name: "TabBarOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tabbutton.qml b/tests/auto/quickcontrols2/accessibility/data/override/tabbutton.qml
deleted file mode 100644
index 1530a2d1..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/tabbutton.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-TabButton {
-    text: "TabButton"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/textarea.qml b/tests/auto/quickcontrols2/accessibility/data/override/textarea.qml
deleted file mode 100644
index 2b142225..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/textarea.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-TextArea {
-    text: "TextArea"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/textfield.qml b/tests/auto/quickcontrols2/accessibility/data/override/textfield.qml
deleted file mode 100644
index 42098b66..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/textfield.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-TextField {
-    text: "TextField"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/toolbar.qml b/tests/auto/quickcontrols2/accessibility/data/override/toolbar.qml
deleted file mode 100644
index 97406f8c..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/toolbar.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ToolBar {
-    Accessible.name: "ToolBarOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/toolbutton.qml b/tests/auto/quickcontrols2/accessibility/data/override/toolbutton.qml
deleted file mode 100644
index 5ecb427b..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/toolbutton.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ToolButton {
-    text: "ToolButton"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tooltip.qml b/tests/auto/quickcontrols2/accessibility/data/override/tooltip.qml
deleted file mode 100644
index 1a4c3a99..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/tooltip.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ToolTip {
-    text: "ToolTip"
-    Accessible.name: text + "Override"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tumbler.qml b/tests/auto/quickcontrols2/accessibility/data/override/tumbler.qml
deleted file mode 100644
index 947f66cd..00000000
--- a/tests/auto/quickcontrols2/accessibility/data/override/tumbler.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Tumbler {
-    Accessible.name: "TumblerOverride"
-}
diff --git a/tests/auto/quickcontrols2/accessibility/tst_accessibility.cpp b/tests/auto/quickcontrols2/accessibility/tst_accessibility.cpp
deleted file mode 100644
index f2cb8b60..00000000
--- a/tests/auto/quickcontrols2/accessibility/tst_accessibility.cpp
+++ /dev/null
@@ -1,304 +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 <QtQml/qqmlengine.h>
-#include <QtQml/qqmlcomponent.h>
-#include <QtQml/qqmlcontext.h>
-#include <QtQuick/private/qquickitem_p.h>
-#include <QtQuickTemplates2/private/qquickpopup_p.h>
-#include "../shared/util.h"
-
-#if QT_CONFIG(accessibility)
-#include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/qpa/qplatformintegration.h>
-#include <QtGui/qpa/qplatformaccessibility.h>
-#include <QtQuick/private/qquickaccessibleattached_p.h>
-#endif
-
-class tst_accessibility : public QQmlDataTest
-{
-    Q_OBJECT
-
-private slots:
-    void a11y_data();
-    void a11y();
-
-    void override_data();
-    void override();
-
-    void ordering();
-private:
-    QQmlEngine engine;
-};
-
-#if QT_CONFIG(accessibility)
-static QPlatformAccessibility *platformAccessibility()
-{
-    QPlatformIntegration *pfIntegration = QGuiApplicationPrivate::platformIntegration();
-    return pfIntegration ? pfIntegration->accessibility() : nullptr;
-}
-#endif
-
-QString adjustFileBaseName(const QString &fileBaseName)
-{
-#if !QT_CONFIG(accessibility)
-    if (fileBaseName == QLatin1Literal("dayofweekrow")
-            || fileBaseName == QLatin1Literal("monthgrid")
-            || fileBaseName == QLatin1Literal("weeknumbercolumn"))
-        return fileBaseName += QLatin1Literal("-2");
-#else
-    return fileBaseName;
-#endif
-}
-
-QQuickItem *findItem(QObject *object)
-{
-    QQuickItem *item = qobject_cast<QQuickItem *>(object);
-    if (!item) {
-        QQuickPopup *popup = qobject_cast<QQuickPopup *>(object);
-        if (popup)
-            item = popup->popupItem();
-    }
-    return item;
-}
-
-void tst_accessibility::a11y_data()
-{
-    QTest::addColumn<QString>("fileBaseName");
-    QTest::addColumn<QAccessible::Role>("role");
-    QTest::addColumn<QString>("text");
-
-    QTest::newRow("AbstractButton") << "abstractbutton" << QAccessible::Button << "AbstractButton";
-    QTest::newRow("BusyIndicator") << "busyindicator" << QAccessible::Indicator << "";
-    QTest::newRow("Button") << "button" << QAccessible::Button << "Button";
-    QTest::newRow("CheckBox") << "checkbox" << QAccessible::CheckBox << "CheckBox";
-    QTest::newRow("CheckDelegate") << "checkdelegate" << QAccessible::CheckBox << "CheckDelegate";
-    QTest::newRow("ComboBox") << "combobox" << QAccessible::ComboBox << "ComboBox";
-    QTest::newRow("Container") << "container" << QAccessible::NoRole << "";
-    QTest::newRow("Control") << "control" << QAccessible::NoRole << "";
-    QTest::newRow("Dial") << "dial" << QAccessible::Dial << "";
-    QTest::newRow("Dialog") << "dialog" << QAccessible::Dialog << "Dialog";
-    QTest::newRow("Drawer") << "drawer" << QAccessible::Dialog << "";
-    QTest::newRow("Frame") << "frame" << QAccessible::Border << "";
-    QTest::newRow("GroupBox") << "groupbox" << QAccessible::Grouping << "GroupBox";
-    QTest::newRow("ItemDelegate") << "itemdelegate" << QAccessible::ListItem << "ItemDelegate";
-    QTest::newRow("Label") << "label" << QAccessible::StaticText << "Label";
-    QTest::newRow("Menu") << "menu" << QAccessible::PopupMenu << "";
-    QTest::newRow("MenuItem") << "menuitem" << QAccessible::MenuItem << "MenuItem";
-    QTest::newRow("Page") << "page" << QAccessible::PageTab << "Page";
-    QTest::newRow("PageIndicator") << "pageindicator" << QAccessible::Indicator << "";
-    QTest::newRow("Pane") << "pane" << QAccessible::Pane << "";
-    QTest::newRow("Popup") << "popup" << QAccessible::Dialog << "";
-    QTest::newRow("ProgressBar") << "progressbar" << QAccessible::ProgressBar << "";
-    QTest::newRow("RadioButton") << "radiobutton" << QAccessible::RadioButton << "RadioButton";
-    QTest::newRow("RadioDelegate") << "radiodelegate" << QAccessible::RadioButton << "RadioDelegate";
-    QTest::newRow("RangeSlider") << "rangeslider" << QAccessible::Slider << "";
-    QTest::newRow("RoundButton") << "roundbutton" << QAccessible::Button << "RoundButton";
-    QTest::newRow("ScrollBar") << "scrollbar" << QAccessible::ScrollBar << "";
-    QTest::newRow("ScrollIndicator") << "scrollindicator" << QAccessible::Indicator << "";
-    QTest::newRow("Slider") << "slider" << QAccessible::Slider << "";
-    QTest::newRow("SpinBox") << "spinbox" << QAccessible::SpinBox << "";
-    QTest::newRow("StackView") << "stackview" << QAccessible::LayeredPane << "";
-    QTest::newRow("SwipeDelegate") << "swipedelegate" << QAccessible::ListItem << "SwipeDelegate";
-    QTest::newRow("SwipeView") << "swipeview" << QAccessible::PageTabList << "";
-    QTest::newRow("Switch") << "switch" << QAccessible::CheckBox << "Switch";
-    QTest::newRow("SwitchDelegate") << "switchdelegate" << QAccessible::ListItem << "SwitchDelegate";
-    QTest::newRow("TabBar") << "tabbar" << QAccessible::PageTabList << "";
-    QTest::newRow("TabButton") << "tabbutton" << QAccessible::PageTab << "TabButton";
-    QTest::newRow("TextArea") << "textarea" << QAccessible::EditableText << "";
-    QTest::newRow("TextField") << "textfield" << QAccessible::EditableText << "";
-    QTest::newRow("ToolBar") << "toolbar" << QAccessible::ToolBar << "";
-    QTest::newRow("ToolButton") << "toolbutton" << QAccessible::Button << "ToolButton";
-    QTest::newRow("ToolTip") << "tooltip" << QAccessible::ToolTip << "ToolTip";
-    QTest::newRow("Tumbler") << "tumbler" << QAccessible::NoRole << ""; // TODO
-}
-
-void tst_accessibility::a11y()
-{
-    QFETCH(QString, fileBaseName);
-    QFETCH(QAccessible::Role, role);
-    QFETCH(QString, text);
-
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl("defaults/" + adjustFileBaseName(fileBaseName) + ".qml"));
-
-    QScopedPointer<QObject> object(component.create());
-    QVERIFY2(!object.isNull(), qPrintable(component.errorString()));
-
-    QQuickItem *item = findItem(object.data());
-    QVERIFY(item);
-
-#if QT_CONFIG(accessibility)
-    QQuickAccessibleAttached *attached = QQuickAccessibleAttached::attachedProperties(item);
-    if (QAccessible::isActive()) {
-        QVERIFY(attached);
-    } else {
-        QVERIFY(!attached);
-        QPlatformAccessibility *accessibility = platformAccessibility();
-        if (!accessibility)
-            QSKIP("No QPlatformAccessibility available.");
-        accessibility->setActive(true);
-        attached = QQuickAccessibleAttached::attachedProperties(item);
-    }
-    QVERIFY(attached);
-    QCOMPARE(attached->role(), role);
-    QCOMPARE(attached->name(), text);
-#else
-    Q_UNUSED(role);
-    Q_UNUSED(text);
-#endif
-}
-
-void tst_accessibility::override_data()
-{
-    QTest::addColumn<QAccessible::Role>("role");
-
-    QTest::newRow("AbstractButton") << QAccessible::Button;
-    QTest::newRow("BusyIndicator") << QAccessible::Indicator;
-    QTest::newRow("Button") << QAccessible::Button;
-    QTest::newRow("CheckBox") << QAccessible::CheckBox;
-    QTest::newRow("CheckDelegate") << QAccessible::CheckBox;
-    QTest::newRow("ComboBox") << QAccessible::ComboBox;
-    QTest::newRow("Container") << QAccessible::NoRole;
-    QTest::newRow("Control") << QAccessible::NoRole;
-    QTest::newRow("Dial") << QAccessible::Dial;
-    QTest::newRow("Dialog") << QAccessible::Dialog;
-    QTest::newRow("Drawer") << QAccessible::Dialog;
-    QTest::newRow("Frame") << QAccessible::Border;
-    QTest::newRow("GroupBox") << QAccessible::Grouping;
-    QTest::newRow("ItemDelegate") << QAccessible::ListItem;
-    QTest::newRow("Label") << QAccessible::StaticText;
-    QTest::newRow("Menu") << QAccessible::PopupMenu;
-    QTest::newRow("MenuItem") << QAccessible::MenuItem;
-    QTest::newRow("Page") << QAccessible::PageTab;
-    QTest::newRow("PageIndicator") << QAccessible::Indicator;
-    QTest::newRow("Pane") << QAccessible::Pane;
-    QTest::newRow("Popup") << QAccessible::Dialog;
-    QTest::newRow("ProgressBar") << QAccessible::ProgressBar;
-    QTest::newRow("RadioButton") << QAccessible::RadioButton;
-    QTest::newRow("RadioDelegate") << QAccessible::RadioButton;
-    QTest::newRow("RangeSlider") << QAccessible::Slider;
-    QTest::newRow("RoundButton") << QAccessible::Button;
-    QTest::newRow("ScrollBar") << QAccessible::ScrollBar;
-    QTest::newRow("ScrollIndicator") << QAccessible::Indicator;
-    QTest::newRow("Slider") << QAccessible::Slider;
-    QTest::newRow("SpinBox") << QAccessible::SpinBox;
-    QTest::newRow("StackView") << QAccessible::LayeredPane;
-    QTest::newRow("SwipeDelegate") << QAccessible::ListItem;
-    QTest::newRow("SwipeView") << QAccessible::PageTabList;
-    QTest::newRow("Switch") << QAccessible::CheckBox;
-    QTest::newRow("SwitchDelegate") << QAccessible::ListItem;
-    QTest::newRow("TabBar") << QAccessible::PageTabList;
-    QTest::newRow("TabButton") << QAccessible::PageTab;
-    QTest::newRow("TextArea") << QAccessible::EditableText;
-    QTest::newRow("TextField") << QAccessible::EditableText;
-    QTest::newRow("ToolBar") << QAccessible::ToolBar;
-    QTest::newRow("ToolButton") << QAccessible::Button;
-    QTest::newRow("ToolTip") << QAccessible::ToolTip;
-    QTest::newRow("Tumbler") << QAccessible::NoRole;
-}
-
-void tst_accessibility::override()
-{
-    QFETCH(QAccessible::Role, role);
-
-    const QString name = QTest::currentDataTag();
-    const QString fileBaseName = name.toLower();
-
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl("override/" + adjustFileBaseName(fileBaseName) + ".qml"));
-
-    QScopedPointer<QObject> object(component.create());
-    QVERIFY2(!object.isNull(), qPrintable(component.errorString()));
-
-    QQuickItem *item = findItem(object.data());
-    QVERIFY(item);
-
-#if QT_CONFIG(accessibility)
-    QQuickAccessibleAttached *attached = QQuickAccessibleAttached::attachedProperties(item);
-    if (QAccessible::isActive()) {
-        QVERIFY(attached);
-    } else {
-        QPlatformAccessibility *accessibility = platformAccessibility();
-        if (!accessibility)
-            QSKIP("No QPlatformAccessibility available.");
-        accessibility->setActive(true);
-        if (!attached)
-            attached = QQuickAccessibleAttached::attachedProperties(item);
-    }
-
-    QVERIFY(attached);
-    QCOMPARE(attached->role(), role);
-    QCOMPARE(attached->name(), name + "Override");
-#else
-    Q_UNUSED(role);
-    Q_UNUSED(text);
-#endif
-}
-template <typename Predicate>
-void a11yDescendants(QAccessibleInterface *iface, Predicate pred)
-{
-    for (int i = 0; i < iface->childCount(); ++i) {
-        if (QAccessibleInterface *child = iface->child(i)) {
-            pred(child);
-            a11yDescendants(child, pred);
-        }
-    }
-}
-
-void tst_accessibility::ordering()
-{
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl("ordering/page.qml"));
-
-    QScopedPointer<QObject> object(component.create());
-    QVERIFY2(!object.isNull(), qPrintable(component.errorString()));
-
-#if QT_CONFIG(accessibility)
-    QQuickItem *item = findItem(object.data());
-    QVERIFY(item);
-    QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(item);
-    QVERIFY(iface);
-    QStringList strings;
-    a11yDescendants(iface, [&](QAccessibleInterface *iface) {strings << iface->text(QAccessible::Name);});
-    QCOMPARE(strings.join(QLatin1String(", ")), "Header, Content item 1, Content item 2, Footer");
-#endif
-}
-
-QTEST_MAIN(tst_accessibility)
-
-#include "tst_accessibility.moc"