97 files changed, 105 insertions, 42 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 032035cb..13344dc1 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -23,7 +23,7 @@ add_subdirectory(qcategoryaxis)
 add_subdirectory(qbarcategoryaxis)
 add_subdirectory(qlegend)
 add_subdirectory(qareaseries)
-# add_subdirectory(cmake) # special case
+add_subdirectory(cmake)
 add_subdirectory(qcandlestickmodelmapper)
 add_subdirectory(qcandlestickseries)
 add_subdirectory(qcandlestickset)
diff --git a/tests/auto/chartdataset/CMakeLists.txt b/tests/auto/chartdataset/CMakeLists.txt
index d14bc68a..63988767 100644
--- a/tests/auto/chartdataset/CMakeLists.txt
+++ b/tests/auto/chartdataset/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## chartdataset Test:
 #####################################################################
 
-qt_internal_add_test(chartdataset
+qt_internal_add_test(tst_chartdataset
     SOURCES
         ../inc/tst_definitions.h
         tst_chartdataset.cpp
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 7f772845..90b239a7 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -1,14 +1,44 @@
+# This is an automatic test for the CMake configuration files.
+# To run it manually,
+# 1) mkdir build   # Create a build directory
+# 2) cd build
+# 3) # Run cmake on this directory
+#    `$qt_prefix/bin/qt-cmake ..` or `cmake -DCMAKE_PREFIX_PATH=/path/to/qt ..`
+# 4) ctest         # Run ctest
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.16)
+project(charts_cmake_tests)
+enable_testing()
 
-project(qmake_cmake_files)
+set(required_packages Core Charts)
 
-enable_testing()
+# Setup the test when called as a completely standalone project.
+if(TARGET Qt6::Core)
+    # Tests are built as part of the repository's build tree.
+    # Setup paths so that the Qt packages are found.
+    qt_internal_set_up_build_dir_package_paths()
+endif()
+
+find_package(Qt6 REQUIRED COMPONENTS ${required_packages})
 
-find_package(Qt5Core REQUIRED)
+# Setup common test variables which were previously set by ctest_testcase_common.prf.
+set(CMAKE_MODULES_UNDER_TEST "${required_packages}")
 
-include("${_Qt5CTestMacros}")
+foreach(qt_package ${CMAKE_MODULES_UNDER_TEST})
+    set(package_name "${QT_CMAKE_EXPORT_NAMESPACE}${qt_package}")
+    if(${package_name}_FOUND)
+        set(CMAKE_${qt_package}_MODULE_MAJOR_VERSION "${${package_name}_VERSION_MAJOR}")
+        set(CMAKE_${qt_package}_MODULE_MINOR_VERSION "${${package_name}_VERSION_MINOR}")
+        set(CMAKE_${qt_package}_MODULE_PATCH_VERSION "${${package_name}_VERSION_PATCH}")
+    endif()
+endforeach()
+
+include("${_Qt6CTestMacros}")
+
+set(module_includes
+    Charts QChartView
+)
 
-test_module_includes(
-  Charts QChartView
+_qt_internal_test_module_includes(
+     ${module_includes}
 )
diff --git a/tests/auto/domain/CMakeLists.txt b/tests/auto/domain/CMakeLists.txt
index 6fbcaed6..870d286c 100644
--- a/tests/auto/domain/CMakeLists.txt
+++ b/tests/auto/domain/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## domain Test:
 #####################################################################
 
-qt_internal_add_test(domain
+qt_internal_add_test(tst_domain
     SOURCES
         ../inc/tst_definitions.h
         tst_domain.cpp
diff --git a/tests/auto/qareaseries/BLACKLIST b/tests/auto/qareaseries/BLACKLIST
index 2f0ae955..996d7802 100644
--- a/tests/auto/qareaseries/BLACKLIST
+++ b/tests/auto/qareaseries/BLACKLIST
@@ -1,2 +1,6 @@
 [dynamicEdgeSeriesChange]
 msvc-2019
+# QTBUG-102722
+android
+[areaSeries]
+android
diff --git a/tests/auto/qareaseries/CMakeLists.txt b/tests/auto/qareaseries/CMakeLists.txt
index e7410fda..500ceb52 100644
--- a/tests/auto/qareaseries/CMakeLists.txt
+++ b/tests/auto/qareaseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qareaseries Test:
 #####################################################################
 
-qt_internal_add_test(qareaseries
+qt_internal_add_test(tst_qareaseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qareaseries.cpp
diff --git a/tests/auto/qbarcategoryaxis/CMakeLists.txt b/tests/auto/qbarcategoryaxis/CMakeLists.txt
index fa1d31cb..89189977 100644
--- a/tests/auto/qbarcategoryaxis/CMakeLists.txt
+++ b/tests/auto/qbarcategoryaxis/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qbarcategoryaxis Test:
 #####################################################################
 
-qt_internal_add_test(qbarcategoryaxis
+qt_internal_add_test(tst_qbarcategoryaxis
     SOURCES
         ../inc/tst_definitions.h
         ../qabstractaxis/tst_qabstractaxis.cpp ../qabstractaxis/tst_qabstractaxis.h
diff --git a/tests/auto/qbarmodelmapper/CMakeLists.txt b/tests/auto/qbarmodelmapper/CMakeLists.txt
index 8a3d4aec..1e1a2c94 100644
--- a/tests/auto/qbarmodelmapper/CMakeLists.txt
+++ b/tests/auto/qbarmodelmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qbarmodelmapper Test:
 #####################################################################
 
-qt_internal_add_test(qbarmodelmapper
+qt_internal_add_test(tst_qbarmodelmapper
     SOURCES
         ../inc/tst_definitions.h
         tst_qbarmodelmapper.cpp
diff --git a/tests/auto/qbarseries/CMakeLists.txt b/tests/auto/qbarseries/CMakeLists.txt
index 3bad94b7..29aa4345 100644
--- a/tests/auto/qbarseries/CMakeLists.txt
+++ b/tests/auto/qbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qbarseries
+qt_internal_add_test(tst_qbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qbarseries.cpp
diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp
index d2c0cdc2..7dbde4d4 100644
--- a/tests/auto/qbarseries/tst_qbarseries.cpp
+++ b/tests/auto/qbarseries/tst_qbarseries.cpp
@@ -649,6 +649,9 @@ void tst_QBarSeries::mousehovered()
 {
     QFETCH(uint, labelsPosition);
     QFETCH(bool, labelsVisible);
+#ifdef Q_OS_ANDROID
+    QSKIP("Android emulator doesn't have a mouse enabled");
+#endif
 
     QBarSeries* series = new QBarSeries();
     series->setLabelsVisible(labelsVisible);
diff --git a/tests/auto/qbarset/CMakeLists.txt b/tests/auto/qbarset/CMakeLists.txt
index 842168bb..bcacb6e1 100644
--- a/tests/auto/qbarset/CMakeLists.txt
+++ b/tests/auto/qbarset/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qbarset Test:
 #####################################################################
 
-qt_internal_add_test(qbarset
+qt_internal_add_test(tst_qbarset
     SOURCES
         ../inc/tst_definitions.h
         tst_qbarset.cpp
diff --git a/tests/auto/qcandlestickmodelmapper/CMakeLists.txt b/tests/auto/qcandlestickmodelmapper/CMakeLists.txt
index 89893b90..1260bee1 100644
--- a/tests/auto/qcandlestickmodelmapper/CMakeLists.txt
+++ b/tests/auto/qcandlestickmodelmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcandlestickmodelmapper Test:
 #####################################################################
 
-qt_internal_add_test(qcandlestickmodelmapper
+qt_internal_add_test(tst_qcandlestickmodelmapper
     SOURCES
         ../inc/tst_definitions.h
         tst_qcandlestickmodelmapper.cpp
diff --git a/tests/auto/qcandlestickseries/CMakeLists.txt b/tests/auto/qcandlestickseries/CMakeLists.txt
index 66eca374..430744c7 100644
--- a/tests/auto/qcandlestickseries/CMakeLists.txt
+++ b/tests/auto/qcandlestickseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcandlestickseries Test:
 #####################################################################
 
-qt_internal_add_test(qcandlestickseries
+qt_internal_add_test(tst_qcandlestickseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qcandlestickseries.cpp
diff --git a/tests/auto/qcandlestickset/CMakeLists.txt b/tests/auto/qcandlestickset/CMakeLists.txt
index c4376efa..4728a9b6 100644
--- a/tests/auto/qcandlestickset/CMakeLists.txt
+++ b/tests/auto/qcandlestickset/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcandlestickset Test:
 #####################################################################
 
-qt_internal_add_test(qcandlestickset
+qt_internal_add_test(tst_qcandlestickset
     SOURCES
         ../inc/tst_definitions.h
         tst_qcandlestickset.cpp
diff --git a/tests/auto/qcategoryaxis/CMakeLists.txt b/tests/auto/qcategoryaxis/CMakeLists.txt
index a3e2a6e8..1574866c 100644
--- a/tests/auto/qcategoryaxis/CMakeLists.txt
+++ b/tests/auto/qcategoryaxis/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcategoryaxis Test:
 #####################################################################
 
-qt_internal_add_test(qcategoryaxis
+qt_internal_add_test(tst_qcategoryaxis
     SOURCES
         ../inc/tst_definitions.h
         ../qabstractaxis/tst_qabstractaxis.cpp ../qabstractaxis/tst_qabstractaxis.h
diff --git a/tests/auto/qchart/CMakeLists.txt b/tests/auto/qchart/CMakeLists.txt
index dc81bc8c..3702470d 100644
--- a/tests/auto/qchart/CMakeLists.txt
+++ b/tests/auto/qchart/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qchart Test:
 #####################################################################
 
-qt_internal_add_test(qchart
+qt_internal_add_test(tst_qchart
     SOURCES
         ../inc/tst_definitions.h
         tst_qchart.cpp
diff --git a/tests/auto/qchartview/CMakeLists.txt b/tests/auto/qchartview/CMakeLists.txt
index fca5fc13..c6c669ec 100644
--- a/tests/auto/qchartview/CMakeLists.txt
+++ b/tests/auto/qchartview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qchartview Test:
 #####################################################################
 
-qt_internal_add_test(qchartview
+qt_internal_add_test(tst_qchartview
     SOURCES
         ../inc/tst_definitions.h
         tst_qchartview.cpp
diff --git a/tests/auto/qdatetimeaxis/CMakeLists.txt b/tests/auto/qdatetimeaxis/CMakeLists.txt
index e5b277b9..2c30c2e4 100644
--- a/tests/auto/qdatetimeaxis/CMakeLists.txt
+++ b/tests/auto/qdatetimeaxis/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qdatetimeaxis Test:
 #####################################################################
 
-qt_internal_add_test(qdatetimeaxis
+qt_internal_add_test(tst_qdatetimeaxis
     SOURCES
         ../inc/tst_definitions.h
         ../qabstractaxis/tst_qabstractaxis.cpp ../qabstractaxis/tst_qabstractaxis.h
diff --git a/tests/auto/qhorizontalbarseries/CMakeLists.txt b/tests/auto/qhorizontalbarseries/CMakeLists.txt
index 19cea05d..3c2fef19 100644
--- a/tests/auto/qhorizontalbarseries/CMakeLists.txt
+++ b/tests/auto/qhorizontalbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qhorizontalbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qhorizontalbarseries
+qt_internal_add_test(tst_qhorizontalbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qhorizontalbarseries.cpp
diff --git a/tests/auto/qhorizontalpercentbarseries/CMakeLists.txt b/tests/auto/qhorizontalpercentbarseries/CMakeLists.txt
index cc630fc7..7102a26c 100644
--- a/tests/auto/qhorizontalpercentbarseries/CMakeLists.txt
+++ b/tests/auto/qhorizontalpercentbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qhorizontalpercentbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qhorizontalpercentbarseries
+qt_internal_add_test(tst_qhorizontalpercentbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qhorizontalpercentbarseries.cpp
diff --git a/tests/auto/qhorizontalstackedbarseries/CMakeLists.txt b/tests/auto/qhorizontalstackedbarseries/CMakeLists.txt
index 6871a178..706841e4 100644
--- a/tests/auto/qhorizontalstackedbarseries/CMakeLists.txt
+++ b/tests/auto/qhorizontalstackedbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qhorizontalstackedbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qhorizontalstackedbarseries
+qt_internal_add_test(tst_qhorizontalstackedbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qhorizontalstackedbarseries.cpp
diff --git a/tests/auto/qlegend/CMakeLists.txt b/tests/auto/qlegend/CMakeLists.txt
index 01566eee..c199288a 100644
--- a/tests/auto/qlegend/CMakeLists.txt
+++ b/tests/auto/qlegend/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlegend Test:
 #####################################################################
 
-qt_internal_add_test(qlegend
+qt_internal_add_test(tst_qlegend
     SOURCES
         ../inc/tst_definitions.h
         tst_qlegend.cpp
diff --git a/tests/auto/qlineseries/CMakeLists.txt b/tests/auto/qlineseries/CMakeLists.txt
index 152c36e0..75d9957a 100644
--- a/tests/auto/qlineseries/CMakeLists.txt
+++ b/tests/auto/qlineseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlineseries Test:
 #####################################################################
 
-qt_internal_add_test(qlineseries
+qt_internal_add_test(tst_qlineseries
     SOURCES
         ../inc/tst_definitions.h
         ../qxyseries/tst_qxyseries.cpp ../qxyseries/tst_qxyseries.h
diff --git a/tests/auto/qlogvalueaxis/CMakeLists.txt b/tests/auto/qlogvalueaxis/CMakeLists.txt
index 6c6ff9f1..a6d524cd 100644
--- a/tests/auto/qlogvalueaxis/CMakeLists.txt
+++ b/tests/auto/qlogvalueaxis/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlogvalueaxis Test:
 #####################################################################
 
-qt_internal_add_test(qlogvalueaxis
+qt_internal_add_test(tst_qlogvalueaxis
     SOURCES
         ../inc/tst_definitions.h
         ../qabstractaxis/tst_qabstractaxis.cpp ../qabstractaxis/tst_qabstractaxis.h
diff --git a/tests/auto/qml-qtquicktest/CMakeLists.txt b/tests/auto/qml-qtquicktest/CMakeLists.txt
index 50e48683..ad0462b7 100644
--- a/tests/auto/qml-qtquicktest/CMakeLists.txt
+++ b/tests/auto/qml-qtquicktest/CMakeLists.txt
@@ -3,20 +3,25 @@
 #####################################################################
 ## qml-qtquicktest Test:
 #####################################################################
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
 
-qt_internal_add_test(qml-qtquicktest
+qt_internal_add_test(tst_qml-qtquicktest
     QMLTEST
     SOURCES
         ../inc/tst_definitions.h
         main.cpp
     DEFINES
-        QUICK_TEST_SOURCE_DIR=\"\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"\"
+        QUICK_TEST_SOURCE_DIR=\"\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"\"
     INCLUDE_DIRECTORIES
         ../inc
     PUBLIC_LIBRARIES
         Qt::Charts
         Qt::Gui
         Qt::Widgets
+    TESTDATA ${test_data}
 )
 
 #### Keys ignored in scope 1:.:.:qml-qtquicktest.pro:<TRUE>:
diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis.qml
index f41fd9ec..f41fd9ec 100644
--- a/tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_1.qml b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis_1_1.qml
index 65b9363f..65b9363f 100644
--- a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_1.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis_1_1.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_2.qml b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis_1_2.qml
index 78275c90..78275c90 100644
--- a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_2.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis_1_2.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_3.qml b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis_1_3.qml
index 5b919c37..5b919c37 100644
--- a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_3.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis_1_3.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_4.qml b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis_1_4.qml
index af0cf521..af0cf521 100644
--- a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_4.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis_1_4.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_2_0.qml b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis_2_0.qml
index 4a1b3dda..4a1b3dda 100644
--- a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_2_0.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barcategoryaxis_2_0.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barseries.qml b/tests/auto/qml-qtquicktest/data/tst_barseries.qml
index e3f085dc..e3f085dc 100644
--- a/tests/auto/qml-qtquicktest/tst_barseries.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barseries.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barseries_1_1.qml b/tests/auto/qml-qtquicktest/data/tst_barseries_1_1.qml
index a9caa134..a9caa134 100644
--- a/tests/auto/qml-qtquicktest/tst_barseries_1_1.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barseries_1_1.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barseries_1_2.qml b/tests/auto/qml-qtquicktest/data/tst_barseries_1_2.qml
index 1023af25..1023af25 100644
--- a/tests/auto/qml-qtquicktest/tst_barseries_1_2.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barseries_1_2.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barseries_1_3.qml b/tests/auto/qml-qtquicktest/data/tst_barseries_1_3.qml
index 1e592389..1e592389 100644
--- a/tests/auto/qml-qtquicktest/tst_barseries_1_3.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barseries_1_3.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barseries_1_4.qml b/tests/auto/qml-qtquicktest/data/tst_barseries_1_4.qml
index 0fd9d173..0fd9d173 100644
--- a/tests/auto/qml-qtquicktest/tst_barseries_1_4.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barseries_1_4.qml
diff --git a/tests/auto/qml-qtquicktest/tst_barseries_2_0.qml b/tests/auto/qml-qtquicktest/data/tst_barseries_2_0.qml
index f2b952a2..f2b952a2 100644
--- a/tests/auto/qml-qtquicktest/tst_barseries_2_0.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_barseries_2_0.qml
diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries.qml b/tests/auto/qml-qtquicktest/data/tst_boxplotseries.qml
index 06f01e20..06f01e20 100644
--- a/tests/auto/qml-qtquicktest/tst_boxplotseries.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_boxplotseries.qml
diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml b/tests/auto/qml-qtquicktest/data/tst_boxplotseries_1_3.qml
index 35606f75..35606f75 100644
--- a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_boxplotseries_1_3.qml
diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml b/tests/auto/qml-qtquicktest/data/tst_boxplotseries_1_4.qml
index 51014e11..51014e11 100644
--- a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_boxplotseries_1_4.qml
diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries_2_0.qml b/tests/auto/qml-qtquicktest/data/tst_boxplotseries_2_0.qml
index 58711a8f..58711a8f 100644
--- a/tests/auto/qml-qtquicktest/tst_boxplotseries_2_0.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_boxplotseries_2_0.qml
diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis.qml b/tests/auto/qml-qtquicktest/data/tst_categoryaxis.qml
index 4e050652..4e050652 100644
--- a/tests/auto/qml-qtquicktest/tst_categoryaxis.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_categoryaxis.qml
diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_1.qml b/tests/auto/qml-qtquicktest/data/tst_categoryaxis_1_1.qml
index 8f57c1e2..8f57c1e2 100644
--- a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_1.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_categoryaxis_1_1.qml
diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_2.qml b/tests/auto/qml-qtquicktest/data/tst_categoryaxis_1_2.qml
index 36b95fae..36b95fae 100644
--- a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_2.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_categoryaxis_1_2.qml
diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_3.qml b/tests/auto/qml-qtquicktest/data/tst_categoryaxis_1_3.qml
index 0cf640a4..0cf640a4 100644
--- a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_3.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_categoryaxis_1_3.qml
diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_4.qml b/tests/auto/qml-qtquicktest/data/tst_categoryaxis_1_4.qml
index f724ff17..f724ff17 100644
--- a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_4.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_categoryaxis_1_4.qml
diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis_2_0.qml b/tests/auto/qml-qtquicktest/data/tst_categoryaxis_2_0.qml
index 46fd16b7..46fd16b7 100644
--- a/tests/auto/qml-qtquicktest/tst_categoryaxis_2_0.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_categoryaxis_2_0.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartview.qml b/tests/auto/qml-qtquicktest/data/tst_chartview.qml
index 1efc15e5..1efc15e5 100644
--- a/tests/auto/qml-qtquicktest/tst_chartview.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartview.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartview_1_1.qml b/tests/auto/qml-qtquicktest/data/tst_chartview_1_1.qml
index e27e0166..e27e0166 100644
--- a/tests/auto/qml-qtquicktest/tst_chartview_1_1.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartview_1_1.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartview_1_2.qml b/tests/auto/qml-qtquicktest/data/tst_chartview_1_2.qml
index b7395058..b7395058 100644
--- a/tests/auto/qml-qtquicktest/tst_chartview_1_2.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartview_1_2.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartview_1_3.qml b/tests/auto/qml-qtquicktest/data/tst_chartview_1_3.qml
index fd3e0095..fd3e0095 100644
--- a/tests/auto/qml-qtquicktest/tst_chartview_1_3.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartview_1_3.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartview_1_4.qml b/tests/auto/qml-qtquicktest/data/tst_chartview_1_4.qml
index 47d1b2ee..47d1b2ee 100644
--- a/tests/auto/qml-qtquicktest/tst_chartview_1_4.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartview_1_4.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartview_2_0.qml b/tests/auto/qml-qtquicktest/data/tst_chartview_2_0.qml
index 6f67aae9..6f67aae9 100644
--- a/tests/auto/qml-qtquicktest/tst_chartview_2_0.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartview_2_0.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions.qml
index 6319ac75..6319ac75 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewfunctions.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_1.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions_1_1.qml
index c17da908..c17da908 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_1.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions_1_1.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_2.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions_1_2.qml
index 69880965..69880965 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_2.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions_1_2.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_3.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions_1_3.qml
index cd94f3ed..cd94f3ed 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_3.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions_1_3.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_4.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions_1_4.qml
index 8a4a14ab..8a4a14ab 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_4.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions_1_4.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_2_0.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions_2_0.qml
index 46437cd5..46437cd5 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_2_0.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewfunctions_2_0.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals.qml
index a6ec1231..a6ec1231 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewsignals.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_1.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals_1_1.qml
index ea6134da..ea6134da 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_1.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals_1_1.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_2.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals_1_2.qml
index 4f0d6d86..4f0d6d86 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_2.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals_1_2.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_3.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals_1_3.qml
index 8ce55897..8ce55897 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_3.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals_1_3.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_4.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals_1_4.qml
index 0b9f451d..0b9f451d 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_4.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals_1_4.qml
diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals_2_0.qml b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals_2_0.qml
index e86ea1b3..e86ea1b3 100644
--- a/tests/auto/qml-qtquicktest/tst_chartviewsignals_2_0.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_chartviewsignals_2_0.qml
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries.qml b/tests/auto/qml-qtquicktest/data/tst_pieseries.qml
index 3e6a82e8..3e6a82e8 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_pieseries.qml
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml b/tests/auto/qml-qtquicktest/data/tst_pieseries_1_1.qml
index 5016d15e..5016d15e 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_pieseries_1_1.qml
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml b/tests/auto/qml-qtquicktest/data/tst_pieseries_1_2.qml
index 74ad1511..74ad1511 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_pieseries_1_2.qml
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml b/tests/auto/qml-qtquicktest/data/tst_pieseries_1_3.qml
index 15fd4b6e..15fd4b6e 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_pieseries_1_3.qml
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml b/tests/auto/qml-qtquicktest/data/tst_pieseries_1_4.qml
index ccd133dd..ccd133dd 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_pieseries_1_4.qml
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml b/tests/auto/qml-qtquicktest/data/tst_pieseries_2_0.qml
index 6a594fde..6a594fde 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_pieseries_2_0.qml
diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis.qml b/tests/auto/qml-qtquicktest/data/tst_valueaxis.qml
index 32e12702..32e12702 100644
--- a/tests/auto/qml-qtquicktest/tst_valueaxis.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_valueaxis.qml
diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis_1_1.qml b/tests/auto/qml-qtquicktest/data/tst_valueaxis_1_1.qml
index 1ef81461..1ef81461 100644
--- a/tests/auto/qml-qtquicktest/tst_valueaxis_1_1.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_valueaxis_1_1.qml
diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis_1_2.qml b/tests/auto/qml-qtquicktest/data/tst_valueaxis_1_2.qml
index 9f58eeec..9f58eeec 100644
--- a/tests/auto/qml-qtquicktest/tst_valueaxis_1_2.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_valueaxis_1_2.qml
diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis_1_3.qml b/tests/auto/qml-qtquicktest/data/tst_valueaxis_1_3.qml
index 47c6026b..47c6026b 100644
--- a/tests/auto/qml-qtquicktest/tst_valueaxis_1_3.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_valueaxis_1_3.qml
diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis_1_4.qml b/tests/auto/qml-qtquicktest/data/tst_valueaxis_1_4.qml
index 04b1e434..04b1e434 100644
--- a/tests/auto/qml-qtquicktest/tst_valueaxis_1_4.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_valueaxis_1_4.qml
diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis_2_0.qml b/tests/auto/qml-qtquicktest/data/tst_valueaxis_2_0.qml
index 786c0fba..786c0fba 100644
--- a/tests/auto/qml-qtquicktest/tst_valueaxis_2_0.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_valueaxis_2_0.qml
diff --git a/tests/auto/qml-qtquicktest/tst_xyseries.qml b/tests/auto/qml-qtquicktest/data/tst_xyseries.qml
index fdce5011..fdce5011 100644
--- a/tests/auto/qml-qtquicktest/tst_xyseries.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_xyseries.qml
diff --git a/tests/auto/qml-qtquicktest/tst_xyseries_1_1.qml b/tests/auto/qml-qtquicktest/data/tst_xyseries_1_1.qml
index b3068462..b3068462 100644
--- a/tests/auto/qml-qtquicktest/tst_xyseries_1_1.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_xyseries_1_1.qml
diff --git a/tests/auto/qml-qtquicktest/tst_xyseries_1_2.qml b/tests/auto/qml-qtquicktest/data/tst_xyseries_1_2.qml
index 78028fcf..78028fcf 100644
--- a/tests/auto/qml-qtquicktest/tst_xyseries_1_2.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_xyseries_1_2.qml
diff --git a/tests/auto/qml-qtquicktest/tst_xyseries_1_3.qml b/tests/auto/qml-qtquicktest/data/tst_xyseries_1_3.qml
index 298e9188..298e9188 100644
--- a/tests/auto/qml-qtquicktest/tst_xyseries_1_3.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_xyseries_1_3.qml
diff --git a/tests/auto/qml-qtquicktest/tst_xyseries_1_4.qml b/tests/auto/qml-qtquicktest/data/tst_xyseries_1_4.qml
index 03e37d06..03e37d06 100644
--- a/tests/auto/qml-qtquicktest/tst_xyseries_1_4.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_xyseries_1_4.qml
diff --git a/tests/auto/qml-qtquicktest/tst_xyseries_2_0.qml b/tests/auto/qml-qtquicktest/data/tst_xyseries_2_0.qml
index 357eb2f3..357eb2f3 100644
--- a/tests/auto/qml-qtquicktest/tst_xyseries_2_0.qml
+++ b/tests/auto/qml-qtquicktest/data/tst_xyseries_2_0.qml
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
index 95e5663b..783ab119 100644
--- a/tests/auto/qml/CMakeLists.txt
+++ b/tests/auto/qml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qml Test:
 #####################################################################
 
-qt_internal_add_test(charts_qml
+qt_internal_add_test(tst_charts_qml
     SOURCES
         ../inc/tst_definitions.h
         tst_qml.cpp
diff --git a/tests/auto/qml/tst_qml.cpp b/tests/auto/qml/tst_qml.cpp
index f6f63ed6..cfe13128 100644
--- a/tests/auto/qml/tst_qml.cpp
+++ b/tests/auto/qml/tst_qml.cpp
@@ -98,6 +98,9 @@ QString tst_qml::imports_2_1()
 
 void tst_qml::initTestCase()
 {
+#ifdef Q_OS_ANDROID
+    QSKIP("The test doesn't package resources properly to Android (QTBUG-102725)");
+#endif
 }
 
 void tst_qml::cleanupTestCase()
diff --git a/tests/auto/qpercentbarseries/CMakeLists.txt b/tests/auto/qpercentbarseries/CMakeLists.txt
index aebb80c7..8b147b21 100644
--- a/tests/auto/qpercentbarseries/CMakeLists.txt
+++ b/tests/auto/qpercentbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpercentbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qpercentbarseries
+qt_internal_add_test(tst_qpercentbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qpercentbarseries.cpp
diff --git a/tests/auto/qpiemodelmapper/CMakeLists.txt b/tests/auto/qpiemodelmapper/CMakeLists.txt
index f72d6cb0..eb6cc5b5 100644
--- a/tests/auto/qpiemodelmapper/CMakeLists.txt
+++ b/tests/auto/qpiemodelmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpiemodelmapper Test:
 #####################################################################
 
-qt_internal_add_test(qpiemodelmapper
+qt_internal_add_test(tst_qpiemodelmapper
     SOURCES
         ../inc/tst_definitions.h
         tst_qpiemodelmapper.cpp
diff --git a/tests/auto/qpieseries/BLACKLIST b/tests/auto/qpieseries/BLACKLIST
new file mode 100644
index 00000000..7fd7b1b2
--- /dev/null
+++ b/tests/auto/qpieseries/BLACKLIST
@@ -0,0 +1,9 @@
+# QTBUG-102723
+[clickedSignal]
+android
+[pressedSignal]
+android
+[releasedSignal]
+android
+[doubleClickedSignal]
+android
diff --git a/tests/auto/qpieseries/CMakeLists.txt b/tests/auto/qpieseries/CMakeLists.txt
index 550478df..9db7c58f 100644
--- a/tests/auto/qpieseries/CMakeLists.txt
+++ b/tests/auto/qpieseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpieseries Test:
 #####################################################################
 
-qt_internal_add_test(qpieseries
+qt_internal_add_test(tst_qpieseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qpieseries.cpp
diff --git a/tests/auto/qpieslice/BLACKLIST b/tests/auto/qpieslice/BLACKLIST
new file mode 100644
index 00000000..7fd7b1b2
--- /dev/null
+++ b/tests/auto/qpieslice/BLACKLIST
@@ -0,0 +1,9 @@
+# QTBUG-102723
+[clickedSignal]
+android
+[pressedSignal]
+android
+[releasedSignal]
+android
+[doubleClickedSignal]
+android
diff --git a/tests/auto/qpieslice/CMakeLists.txt b/tests/auto/qpieslice/CMakeLists.txt
index 09b1f480..7361a46b 100644
--- a/tests/auto/qpieslice/CMakeLists.txt
+++ b/tests/auto/qpieslice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpieslice Test:
 #####################################################################
 
-qt_internal_add_test(qpieslice
+qt_internal_add_test(tst_qpieslice
     SOURCES
         ../inc/tst_definitions.h
         tst_qpieslice.cpp
diff --git a/tests/auto/qscatterseries/CMakeLists.txt b/tests/auto/qscatterseries/CMakeLists.txt
index 56792b41..b3cb58a8 100644
--- a/tests/auto/qscatterseries/CMakeLists.txt
+++ b/tests/auto/qscatterseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qscatterseries Test:
 #####################################################################
 
-qt_internal_add_test(qscatterseries
+qt_internal_add_test(tst_qscatterseries
     SOURCES
         ../inc/tst_definitions.h
         ../qxyseries/tst_qxyseries.cpp ../qxyseries/tst_qxyseries.h
diff --git a/tests/auto/qscatterseries/tst_qscatterseries.cpp b/tests/auto/qscatterseries/tst_qscatterseries.cpp
index e91a881b..8d369660 100644
--- a/tests/auto/qscatterseries/tst_qscatterseries.cpp
+++ b/tests/auto/qscatterseries/tst_qscatterseries.cpp
@@ -87,7 +87,7 @@ void tst_QScatterSeries::qscatterseries()
     QCOMPARE(series.brush(), QBrush());
     QCOMPARE(series.points(), QList<QPointF>());
     QCOMPARE(series.pen(), QPen());
-    QCOMPARE(series.pointsVisible(), false);
+    QCOMPARE(series.pointsVisible(), true);
 
     series.append(QList<QPointF>());
     series.append(0.0,0.0);
@@ -102,7 +102,7 @@ void tst_QScatterSeries::qscatterseries()
     series.setBrush(QBrush());
 
     series.setPen(QPen());
-    series.setPointsVisible(false);
+    series.setPointsVisible(true);
 
     m_chart->addSeries(&series);
     m_view->show();
diff --git a/tests/auto/qsplineseries/CMakeLists.txt b/tests/auto/qsplineseries/CMakeLists.txt
index b75b8197..5f580733 100644
--- a/tests/auto/qsplineseries/CMakeLists.txt
+++ b/tests/auto/qsplineseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qsplineseries Test:
 #####################################################################
 
-qt_internal_add_test(qsplineseries
+qt_internal_add_test(tst_qsplineseries
     SOURCES
         ../inc/tst_definitions.h
         ../qxyseries/tst_qxyseries.cpp ../qxyseries/tst_qxyseries.h
diff --git a/tests/auto/qstackedbarseries/CMakeLists.txt b/tests/auto/qstackedbarseries/CMakeLists.txt
index fc076c52..ecb78bec 100644
--- a/tests/auto/qstackedbarseries/CMakeLists.txt
+++ b/tests/auto/qstackedbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qstackedbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qstackedbarseries
+qt_internal_add_test(tst_qstackedbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qstackedbarseries.cpp
diff --git a/tests/auto/qvalueaxis/CMakeLists.txt b/tests/auto/qvalueaxis/CMakeLists.txt
index 2d2980c5..b8d253fd 100644
--- a/tests/auto/qvalueaxis/CMakeLists.txt
+++ b/tests/auto/qvalueaxis/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qvalueaxis Test:
 #####################################################################
 
-qt_internal_add_test(qvalueaxis
+qt_internal_add_test(tst_qvalueaxis
     SOURCES
         ../inc/tst_definitions.h
         ../qabstractaxis/tst_qabstractaxis.cpp ../qabstractaxis/tst_qabstractaxis.h
diff --git a/tests/auto/qxymodelmapper/CMakeLists.txt b/tests/auto/qxymodelmapper/CMakeLists.txt
index 7dd66467..1f261a31 100644
--- a/tests/auto/qxymodelmapper/CMakeLists.txt
+++ b/tests/auto/qxymodelmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qxymodelmapper Test:
 #####################################################################
 
-qt_internal_add_test(qxymodelmapper
+qt_internal_add_test(tst_qxymodelmapper
     SOURCES
         ../inc/tst_definitions.h
         tst_qxymodelmapper.cpp