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>

4 files changed, 0 insertions, 114 deletions

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()