Cleanup tests that add test data to resources explicitly

Remove Integrity and Android specific code that explicitly adds
test data to the resource files. qt_internal_add_test functions
implicitly adds test data to resources for Android and Integrity
platforms by default.

Change-Id: Ia1d58755b47442e1953462e38606f70fec262368
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

19 files changed, 24 insertions, 591 deletions

diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
index 2bd6033440..ea799619d3 100644
--- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt
+++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
@@ -14,23 +14,3 @@ qt_internal_add_test(tst_qiodevice
         Qt::Network
     TESTDATA ${test_data}
 )
-
-#### Keys ignored in scope 1:.:.:qiodevice.pro:<TRUE>:
-# MOC_DIR = "tmp"
-
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(android_testdata_resource_files
-        "tst_qiodevice.cpp"
-    )
-
-    qt_internal_add_resource(tst_qiodevice "android_testdata"
-        PREFIX
-            "/"
-        FILES
-            ${android_testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
index a00fb8cb32..80da400032 100644
--- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
+++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
@@ -14,23 +14,3 @@ qt_internal_add_test(tst_qloggingregistry
         Qt::CorePrivate
     TESTDATA ${test_data}
 )
-
-#### Keys ignored in scope 1:.:.:qloggingregistry.pro:<TRUE>:
-# TEMPLATE = "app"
-
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(android_testdata_resource_files
-        "qtlogging.ini"
-    )
-
-    qt_internal_add_resource(tst_qloggingregistry "android_testdata"
-        PREFIX
-            "/"
-        FILES
-            ${android_testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
index ac4fb55813..264c459a89 100644
--- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
@@ -21,23 +21,6 @@ qt_internal_add_test(tst_qmetatype
     TESTDATA ${test_data}
 )
 
-if(INTEGRITY)
-    # Resources:
-    set(testdata_resource_files
-        "typeFlags.bin"
-    )
-
-    qt_internal_add_resource(tst_qmetatype "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()
-
-## Scopes:
-#####################################################################
-
 qt_internal_extend_target(tst_qmetatype CONDITION MSVC
     COMPILE_OPTIONS
         /bigobj
diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt
index 9022ed9f3d..01432873f5 100644
--- a/tests/auto/corelib/serialization/json/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/json/CMakeLists.txt
@@ -4,39 +4,24 @@
 ## tst_json Test:
 #####################################################################
 
+set(json_resource_files
+    "bom.json"
+    "test.json"
+    "test2.json"
+    "test3.json"
+    "simple.duplicates.json"
+    "test.duplicates.json"
+    "test3.duplicates.json"
+)
+
 qt_internal_add_test(tst_json
     SOURCES
         tst_qtjson.cpp
     PUBLIC_LIBRARIES
         Qt::CorePrivate
+    TESTDATA ${json_resource_files}
 )
 
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:json.pro:NOT ANDROID:
-# TESTDATA = "bom.json" "test.json" "test3.json" "test2.json"
-
-if(ANDROID OR INTEGRITY)
-    # Resources:
-    set(json_resource_files
-        "bom.json"
-        "test.json"
-        "test2.json"
-        "test3.json"
-        "simple.duplicates.json"
-        "test.duplicates.json"
-        "test3.duplicates.json"
-    )
-
-    qt_internal_add_resource(tst_json "json"
-        PREFIX
-            "/"
-        FILES
-            ${json_resource_files}
-    )
-endif()
-
 qt_internal_extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
     DEFINES
         QT_NO_DOUBLECONVERSION
diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
index b29088c712..361ababd4c 100644
--- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
@@ -15,21 +15,3 @@ qt_internal_add_test(tst_qdatastream
         Qt::Gui
     TESTDATA ${test_data}
 )
-
-## Scopes:
-#####################################################################
-
-if(ANDROID OR INTEGRITY)
-    # Resources:
-    set(testdata_resource_files
-        "datastream.q42"
-        "typedef.q5"
-    )
-
-    qt_internal_add_resource(tst_qdatastream "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
index cb48aed16c..c0b9752fc5 100644
--- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
@@ -36,28 +36,6 @@ qt_internal_add_resource(tst_qtextstream "qtextstream"
         ${qtextstream_resource_files}
 )
 
-if(INTEGRITY)
-set(qtextstream_resource_files_integrity
-    "../rfc3261.txt"
-    "../task113817.txt"
-    "../tst_qtextstream.cpp"
-)
-
-qt_internal_add_resource(tst_qtextstream "qtextstream_integrity"
-    PREFIX
-        "/"
-    FILES
-        ${qtextstream_resource_files_integrity}
-)
-endif()
-
-## Scopes:
-
-qt_internal_extend_target(tst_qtextstream CONDITION builtin_testdata OR INTEGRITY
-    DEFINES
-        BUILTIN_TESTDATA
-)
-
 if(QT_FEATURE_process)
-  add_dependencies(tst_qtextstream stdinProcess readAllStdinProcess readLineStdinProcess)
+    add_dependencies(tst_qtextstream stdinProcess readAllStdinProcess readLineStdinProcess)
 endif()
diff --git a/tests/auto/corelib/text/qbytearray/CMakeLists.txt b/tests/auto/corelib/text/qbytearray/CMakeLists.txt
index 36bbef19a5..d1a65adcd8 100644
--- a/tests/auto/corelib/text/qbytearray/CMakeLists.txt
+++ b/tests/auto/corelib/text/qbytearray/CMakeLists.txt
@@ -24,17 +24,3 @@ qt_internal_extend_target(tst_qbytearray CONDITION APPLE
     PUBLIC_LIBRARIES
         ${FWFoundation}
 )
-
-if(ANDROID OR INTEGRITY)
-    # Resources:
-    set(testdata_resource_files
-        "rfc3252.txt"
-    )
-
-    qt_internal_add_resource(tst_qbytearray "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/corelib/text/qchar/CMakeLists.txt b/tests/auto/corelib/text/qchar/CMakeLists.txt
index 06faffb60e..e46bb37422 100644
--- a/tests/auto/corelib/text/qchar/CMakeLists.txt
+++ b/tests/auto/corelib/text/qchar/CMakeLists.txt
@@ -14,20 +14,3 @@ qt_internal_add_test(tst_qchar
         Qt::CorePrivate
     TESTDATA ${test_data}
 )
-
-## Scopes:
-#####################################################################
-
-if(ANDROID OR INTEGRITY)
-    # Resources:
-    set(testdata_resource_files
-        "data/NormalizationTest.txt"
-    )
-
-    qt_internal_add_resource(tst_qchar "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt
index f64aaaf8d2..0e344cc8d7 100644
--- a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt
@@ -11,17 +11,3 @@ qt_internal_add_test(tst_qstringconverter
         tst_qstringconverter.cpp
     TESTDATA ${test_data}
 )
-
-if(INTEGRITY)
-    # Resources:
-    set(testdata_resource_files
-        "utf8.txt"
-    )
-
-    qt_internal_add_resource(tst_qstringconverter "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt b/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt
index 024608dc8d..0db89e91ab 100644
--- a/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt
+++ b/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt
@@ -5,30 +5,13 @@
 #####################################################################
 
 # Collect test data
-list(APPEND test_data "data")
+file(GLOB_RECURSE test_data
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*
+)
 
 qt_internal_add_test(tst_qtextboundaryfinder
     SOURCES
         tst_qtextboundaryfinder.cpp
     TESTDATA ${test_data}
 )
-
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(testdata_resource_files
-        "data/GraphemeBreakTest.txt"
-        "data/LineBreakTest.txt"
-        "data/SentenceBreakTest.txt"
-        "data/WordBreakTest.txt"
-    )
-
-    qt_internal_add_resource(tst_qtextboundaryfinder "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
index cea74758cc..c9fe345e66 100644
--- a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
@@ -15,21 +15,3 @@ qt_internal_add_test(tst_qcryptographichash
         tst_qcryptographichash.cpp
     TESTDATA ${test_data}
 )
-
-## Scopes:
-#####################################################################
-
-if(ANDROID OR INTEGRITY)
-    # Resources:
-    set(testdata_resource_files
-        "data/2c1517dad3678f03917f15849b052fd5.md5"
-        "data/d41d8cd98f00b204e9800998ecf8427e.md5"
-    )
-
-    qt_internal_add_resource(tst_qcryptographichash "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
index 704c51a6be..9e77aad1fe 100644
--- a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
+++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
@@ -18,32 +18,3 @@ qt_internal_add_test(tst_qicoimageformat
     TESTDATA ${test_data}
 )
 
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(qicoimageformat_resource_files
-        "icons/invalid/35floppy.ico"
-        "icons/valid/35FLOPPY.ICO"
-        "icons/valid/AddPerfMon.ico"
-        "icons/valid/App.ico"
-        "icons/valid/Obj_N2_Internal_Mem.ico"
-        "icons/valid/Qt.ico"
-        "icons/valid/Status_Play.ico"
-        "icons/valid/TIMER01.ICO"
-        "icons/valid/WORLD.ico"
-        "icons/valid/WORLDH.ico"
-        "icons/valid/abcardWindow.ico"
-        "icons/valid/semitransparent.ico"
-        "icons/valid/trolltechlogo_tiny.ico"
-        "icons/valid/yellow.cur"
-    )
-
-    qt_internal_add_resource(tst_qicoimageformat "qicoimageformat"
-        PREFIX
-            "/"
-        FILES
-            ${qicoimageformat_resource_files}
-    )
-endif()
diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt
index 4c95b32e48..60c6267463 100644
--- a/tests/auto/gui/image/qimage/CMakeLists.txt
+++ b/tests/auto/gui/image/qimage/CMakeLists.txt
@@ -20,40 +20,6 @@ qt_internal_add_test(tst_qimage
     TESTDATA ${test_data}
 )
 
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(qimage_resource_files
-        "images/image.bmp"
-        "images/image.gif"
-        "images/image.ico"
-        "images/image.jpg"
-        "images/image.pbm"
-        "images/image.pgm"
-        "images/image.png"
-        "images/image.ppm"
-        "images/image.xbm"
-        "images/image.xpm"
-        "images/jpeg_exif_orientation_value_1.jpg"
-        "images/jpeg_exif_orientation_value_2.jpg"
-        "images/jpeg_exif_orientation_value_3.jpg"
-        "images/jpeg_exif_orientation_value_4.jpg"
-        "images/jpeg_exif_orientation_value_5.jpg"
-        "images/jpeg_exif_orientation_value_6.jpg"
-        "images/jpeg_exif_orientation_value_7.jpg"
-        "images/jpeg_exif_orientation_value_8.jpg"
-    )
-
-    qt_internal_add_resource(tst_qimage "qimage"
-        PREFIX
-            "/"
-        FILES
-            ${qimage_resource_files}
-    )
-endif()
-
 qt_internal_extend_target(tst_qimage CONDITION WIN32
     PUBLIC_LIBRARIES
         gdi32
diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt
index a0cda3bb73..3a2dceeebe 100644
--- a/tests/auto/gui/image/qimagereader/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt
@@ -42,24 +42,3 @@ qt_internal_add_resource(tst_qimagereader "qmake_immediate"
         ${qmake_immediate_resource_files}
 )
 
-
-#### Keys ignored in scope 1:.:.:qimagereader.pro:<TRUE>:
-# MOC_DIR = "tmp"
-
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(android_testdata_resource_files
-        "images/kollada-noext"
-        "images/trans.gif"
-    )
-
-    qt_internal_add_resource(tst_qimagereader "android_testdata"
-        PREFIX
-            "/"
-        FILES
-            ${android_testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
index e74321731f..7587645585 100644
--- a/tests/auto/gui/image/qimagewriter/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
@@ -18,33 +18,3 @@ qt_internal_add_test(tst_qimagewriter
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qimagewriter.pro:<TRUE>:
-# MOC_DIR = "tmp"
-
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(qimagewriter_resource_files
-        "images/YCbCr_cmyk.jpg"
-        "images/YCbCr_rgb.jpg"
-        "images/beavis.jpg"
-        "images/colorful.bmp"
-        "images/earth.gif"
-        "images/font.bmp"
-        "images/gnus.xbm"
-        "images/kollada.png"
-        "images/marble.xpm"
-        "images/ship63.pbm"
-        "images/teapot.ppm"
-        "images/trolltech.gif"
-    )
-
-    qt_internal_add_resource(tst_qimagewriter "qimagewriter"
-        PREFIX
-            "/"
-        FILES
-            ${qimagewriter_resource_files}
-    )
-endif()
diff --git a/tests/auto/gui/painting/qpainter/CMakeLists.txt b/tests/auto/gui/painting/qpainter/CMakeLists.txt
index 9466dddadd..3d46a708e9 100644
--- a/tests/auto/gui/painting/qpainter/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpainter/CMakeLists.txt
@@ -41,198 +41,3 @@ qt_internal_extend_target(tst_qpainter CONDITION TARGET Qt::Widgets
         Qt::Widgets
         Qt::WidgetsPrivate
 )
-
-if(ANDROID)
-    # Resources:
-    set(testdata_resource_files
-        "drawEllipse/10x10SizeAt0x0.png"
-        "drawEllipse/10x10SizeAt100x100.png"
-        "drawEllipse/10x10SizeAt200x200.png"
-        "drawEllipse/13x100SizeAt0x0.png"
-        "drawEllipse/13x100SizeAt100x100.png"
-        "drawEllipse/13x100SizeAt200x200.png"
-        "drawEllipse/200x200SizeAt0x0.png"
-        "drawEllipse/200x200SizeAt100x100.png"
-        "drawEllipse/200x200SizeAt200x200.png"
-        "drawLine_rop_bitmap/dst.xbm"
-        "drawLine_rop_bitmap/res/res_AndNotROP.xbm"
-        "drawLine_rop_bitmap/res/res_AndROP.xbm"
-        "drawLine_rop_bitmap/res/res_ClearROP.xbm"
-        "drawLine_rop_bitmap/res/res_CopyROP.xbm"
-        "drawLine_rop_bitmap/res/res_NandROP.xbm"
-        "drawLine_rop_bitmap/res/res_NopROP.xbm"
-        "drawLine_rop_bitmap/res/res_NorROP.xbm"
-        "drawLine_rop_bitmap/res/res_NotAndROP.xbm"
-        "drawLine_rop_bitmap/res/res_NotCopyROP.xbm"
-        "drawLine_rop_bitmap/res/res_NotOrROP.xbm"
-        "drawLine_rop_bitmap/res/res_NotROP.xbm"
-        "drawLine_rop_bitmap/res/res_NotXorROP.xbm"
-        "drawLine_rop_bitmap/res/res_OrNotROP.xbm"
-        "drawLine_rop_bitmap/res/res_OrROP.xbm"
-        "drawLine_rop_bitmap/res/res_SetROP.xbm"
-        "drawLine_rop_bitmap/res/res_XorROP.xbm"
-        "drawPixmap_rop/dst1.png"
-        "drawPixmap_rop/dst2.png"
-        "drawPixmap_rop/dst3.png"
-        "drawPixmap_rop/res/res_AndNotROP0.png"
-        "drawPixmap_rop/res/res_AndNotROP1.png"
-        "drawPixmap_rop/res/res_AndNotROP2.png"
-        "drawPixmap_rop/res/res_AndNotROP3.png"
-        "drawPixmap_rop/res/res_AndNotROP4.png"
-        "drawPixmap_rop/res/res_AndNotROP5.png"
-        "drawPixmap_rop/res/res_AndNotROP6.png"
-        "drawPixmap_rop/res/res_AndNotROP7.png"
-        "drawPixmap_rop/res/res_AndROP0.png"
-        "drawPixmap_rop/res/res_AndROP1.png"
-        "drawPixmap_rop/res/res_AndROP2.png"
-        "drawPixmap_rop/res/res_AndROP3.png"
-        "drawPixmap_rop/res/res_AndROP4.png"
-        "drawPixmap_rop/res/res_AndROP5.png"
-        "drawPixmap_rop/res/res_AndROP6.png"
-        "drawPixmap_rop/res/res_AndROP7.png"
-        "drawPixmap_rop/res/res_ClearROP0.png"
-        "drawPixmap_rop/res/res_ClearROP1.png"
-        "drawPixmap_rop/res/res_ClearROP2.png"
-        "drawPixmap_rop/res/res_ClearROP3.png"
-        "drawPixmap_rop/res/res_ClearROP4.png"
-        "drawPixmap_rop/res/res_ClearROP5.png"
-        "drawPixmap_rop/res/res_ClearROP6.png"
-        "drawPixmap_rop/res/res_ClearROP7.png"
-        "drawPixmap_rop/res/res_CopyROP0.png"
-        "drawPixmap_rop/res/res_CopyROP1.png"
-        "drawPixmap_rop/res/res_CopyROP2.png"
-        "drawPixmap_rop/res/res_CopyROP3.png"
-        "drawPixmap_rop/res/res_CopyROP4.png"
-        "drawPixmap_rop/res/res_CopyROP5.png"
-        "drawPixmap_rop/res/res_CopyROP6.png"
-        "drawPixmap_rop/res/res_CopyROP7.png"
-        "drawPixmap_rop/res/res_NandROP0.png"
-        "drawPixmap_rop/res/res_NandROP1.png"
-        "drawPixmap_rop/res/res_NandROP2.png"
-        "drawPixmap_rop/res/res_NandROP3.png"
-        "drawPixmap_rop/res/res_NandROP4.png"
-        "drawPixmap_rop/res/res_NandROP5.png"
-        "drawPixmap_rop/res/res_NandROP6.png"
-        "drawPixmap_rop/res/res_NandROP7.png"
-        "drawPixmap_rop/res/res_NopROP0.png"
-        "drawPixmap_rop/res/res_NopROP1.png"
-        "drawPixmap_rop/res/res_NopROP2.png"
-        "drawPixmap_rop/res/res_NopROP3.png"
-        "drawPixmap_rop/res/res_NopROP4.png"
-        "drawPixmap_rop/res/res_NopROP5.png"
-        "drawPixmap_rop/res/res_NopROP6.png"
-        "drawPixmap_rop/res/res_NopROP7.png"
-        "drawPixmap_rop/res/res_NorROP0.png"
-        "drawPixmap_rop/res/res_NorROP1.png"
-        "drawPixmap_rop/res/res_NorROP2.png"
-        "drawPixmap_rop/res/res_NorROP3.png"
-        "drawPixmap_rop/res/res_NorROP4.png"
-        "drawPixmap_rop/res/res_NorROP5.png"
-        "drawPixmap_rop/res/res_NorROP6.png"
-        "drawPixmap_rop/res/res_NorROP7.png"
-        "drawPixmap_rop/res/res_NotAndROP0.png"
-        "drawPixmap_rop/res/res_NotAndROP1.png"
-        "drawPixmap_rop/res/res_NotAndROP2.png"
-        "drawPixmap_rop/res/res_NotAndROP3.png"
-        "drawPixmap_rop/res/res_NotAndROP4.png"
-        "drawPixmap_rop/res/res_NotAndROP5.png"
-        "drawPixmap_rop/res/res_NotAndROP6.png"
-        "drawPixmap_rop/res/res_NotAndROP7.png"
-        "drawPixmap_rop/res/res_NotCopyROP0.png"
-        "drawPixmap_rop/res/res_NotCopyROP1.png"
-        "drawPixmap_rop/res/res_NotCopyROP2.png"
-        "drawPixmap_rop/res/res_NotCopyROP3.png"
-        "drawPixmap_rop/res/res_NotCopyROP4.png"
-        "drawPixmap_rop/res/res_NotCopyROP5.png"
-        "drawPixmap_rop/res/res_NotCopyROP6.png"
-        "drawPixmap_rop/res/res_NotCopyROP7.png"
-        "drawPixmap_rop/res/res_NotOrROP0.png"
-        "drawPixmap_rop/res/res_NotOrROP1.png"
-        "drawPixmap_rop/res/res_NotOrROP2.png"
-        "drawPixmap_rop/res/res_NotOrROP3.png"
-        "drawPixmap_rop/res/res_NotOrROP4.png"
-        "drawPixmap_rop/res/res_NotOrROP5.png"
-        "drawPixmap_rop/res/res_NotOrROP6.png"
-        "drawPixmap_rop/res/res_NotOrROP7.png"
-        "drawPixmap_rop/res/res_NotROP0.png"
-        "drawPixmap_rop/res/res_NotROP1.png"
-        "drawPixmap_rop/res/res_NotROP2.png"
-        "drawPixmap_rop/res/res_NotROP3.png"
-        "drawPixmap_rop/res/res_NotROP4.png"
-        "drawPixmap_rop/res/res_NotROP5.png"
-        "drawPixmap_rop/res/res_NotROP6.png"
-        "drawPixmap_rop/res/res_NotROP7.png"
-        "drawPixmap_rop/res/res_NotXorROP0.png"
-        "drawPixmap_rop/res/res_NotXorROP1.png"
-        "drawPixmap_rop/res/res_NotXorROP2.png"
-        "drawPixmap_rop/res/res_NotXorROP3.png"
-        "drawPixmap_rop/res/res_NotXorROP4.png"
-        "drawPixmap_rop/res/res_NotXorROP5.png"
-        "drawPixmap_rop/res/res_NotXorROP6.png"
-        "drawPixmap_rop/res/res_NotXorROP7.png"
-        "drawPixmap_rop/res/res_OrNotROP0.png"
-        "drawPixmap_rop/res/res_OrNotROP1.png"
-        "drawPixmap_rop/res/res_OrNotROP2.png"
-        "drawPixmap_rop/res/res_OrNotROP3.png"
-        "drawPixmap_rop/res/res_OrNotROP4.png"
-        "drawPixmap_rop/res/res_OrNotROP5.png"
-        "drawPixmap_rop/res/res_OrNotROP6.png"
-        "drawPixmap_rop/res/res_OrNotROP7.png"
-        "drawPixmap_rop/res/res_OrROP0.png"
-        "drawPixmap_rop/res/res_OrROP1.png"
-        "drawPixmap_rop/res/res_OrROP2.png"
-        "drawPixmap_rop/res/res_OrROP3.png"
-        "drawPixmap_rop/res/res_OrROP4.png"
-        "drawPixmap_rop/res/res_OrROP5.png"
-        "drawPixmap_rop/res/res_OrROP6.png"
-        "drawPixmap_rop/res/res_OrROP7.png"
-        "drawPixmap_rop/res/res_SetROP0.png"
-        "drawPixmap_rop/res/res_SetROP1.png"
-        "drawPixmap_rop/res/res_SetROP2.png"
-        "drawPixmap_rop/res/res_SetROP3.png"
-        "drawPixmap_rop/res/res_SetROP4.png"
-        "drawPixmap_rop/res/res_SetROP5.png"
-        "drawPixmap_rop/res/res_SetROP6.png"
-        "drawPixmap_rop/res/res_SetROP7.png"
-        "drawPixmap_rop/res/res_XorROP0.png"
-        "drawPixmap_rop/res/res_XorROP1.png"
-        "drawPixmap_rop/res/res_XorROP2.png"
-        "drawPixmap_rop/res/res_XorROP3.png"
-        "drawPixmap_rop/res/res_XorROP4.png"
-        "drawPixmap_rop/res/res_XorROP5.png"
-        "drawPixmap_rop/res/res_XorROP6.png"
-        "drawPixmap_rop/res/res_XorROP7.png"
-        "drawPixmap_rop/src1.xbm"
-        "drawPixmap_rop/src2-mask.xbm"
-        "drawPixmap_rop/src2.xbm"
-        "drawPixmap_rop/src3.xbm"
-        "drawPixmap_rop_bitmap/dst.xbm"
-        "drawPixmap_rop_bitmap/res/res_AndNotROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_AndROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_ClearROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_CopyROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_NandROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_NopROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_NorROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_NotAndROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_NotOrROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_NotROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_NotXorROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_OrNotROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_OrROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_SetROP.xbm"
-        "drawPixmap_rop_bitmap/res/res_XorROP.xbm"
-        "drawPixmap_rop_bitmap/src1-mask.xbm"
-        "drawPixmap_rop_bitmap/src1.xbm"
-        "drawPixmap_rop_bitmap/src2.xbm"
-        "task217400.png"
-    )
-
-    qt_internal_add_resource(tst_qpainter "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/gui/text/qcssparser/CMakeLists.txt b/tests/auto/gui/text/qcssparser/CMakeLists.txt
index 058a42d68c..bd9ca00d60 100644
--- a/tests/auto/gui/text/qcssparser/CMakeLists.txt
+++ b/tests/auto/gui/text/qcssparser/CMakeLists.txt
@@ -1,15 +1,14 @@
 # Generated from qcssparser.pro.
 
-if(NOT QT_FEATURE_private_tests)
-    return()
-endif()
-
 #####################################################################
 ## tst_qcssparser Test:
 #####################################################################
 
 # Collect test data
-list(APPEND test_data "testdata")
+file(GLOB_RECURSE test_data
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    testdata/*
+)
 
 qt_internal_add_test(tst_qcssparser
     SOURCES
@@ -20,36 +19,3 @@ qt_internal_add_test(tst_qcssparser
         Qt::Xml
     TESTDATA ${test_data}
 )
-
-#### Keys ignored in scope 1:.:.:qcssparser.pro:<TRUE>:
-# _REQUIREMENTS = "qtConfig(private_tests)"
-
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(testdata_resource_files
-        "testdata/scanner/comments/input"
-        "testdata/scanner/comments/output"
-        "testdata/scanner/comments2/input"
-        "testdata/scanner/comments2/output"
-        "testdata/scanner/comments3/input"
-        "testdata/scanner/comments3/output"
-        "testdata/scanner/comments4/input"
-        "testdata/scanner/comments4/output"
-        "testdata/scanner/quotedstring/input"
-        "testdata/scanner/quotedstring/output"
-        "testdata/scanner/simple/input"
-        "testdata/scanner/simple/output"
-        "testdata/scanner/unicode/input"
-        "testdata/scanner/unicode/output"
-    )
-
-    qt_internal_add_resource(tst_qcssparser "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/gui/text/qzip/CMakeLists.txt b/tests/auto/gui/text/qzip/CMakeLists.txt
index 7240a611d2..dceda50251 100644
--- a/tests/auto/gui/text/qzip/CMakeLists.txt
+++ b/tests/auto/gui/text/qzip/CMakeLists.txt
@@ -5,7 +5,10 @@
 #####################################################################
 
 # Collect test data
-list(APPEND test_data "testdata")
+file(GLOB_RECURSE test_data
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    testdata/*
+)
 
 qt_internal_add_test(tst_qzip
     SOURCES
@@ -15,21 +18,3 @@ qt_internal_add_test(tst_qzip
         Qt::GuiPrivate
     TESTDATA ${test_data}
 )
-
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(testdata_resource_files
-        "testdata/symlink.zip"
-        "testdata/test.zip"
-    )
-
-    qt_internal_add_resource(tst_qzip "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()
diff --git a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt
index 049fab0f02..89cb2ce8e9 100644
--- a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt
@@ -20,20 +20,3 @@ qt_internal_add_test(tst_qlayout
         Qt::WidgetsPrivate
     TESTDATA ${test_data}
 )
-
-## Scopes:
-#####################################################################
-
-if(ANDROID)
-    # Resources:
-    set(testdata_resource_files
-        "baseline/smartmaxsize"
-    )
-
-    qt_internal_add_resource(tst_qlayout "testdata"
-        PREFIX
-            "/"
-        FILES
-            ${testdata_resource_files}
-    )
-endif()