59 files changed, 7 insertions, 2 deletions
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