Regenerate tests/auto/gui/image

Change-Id: If6aa42d5b19227e488fc2fcf94b8eacc02c2c209
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

5 files changed, 92 insertions, 88 deletions

diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
index 3746668273..0c8393631a 100644
--- a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
+++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
@@ -21,28 +21,29 @@ add_qt_test(tst_qicoimageformat
 ## Scopes:
 #####################################################################
 
-# 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"
-)
-
-add_qt_resource(tst_qicoimageformat "qicoimageformat"
-    PREFIX
-        "/"
-    FILES
-        ${qicoimageformat_resource_files}
-)
+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"
+    )
 
+    add_qt_resource(tst_qicoimageformat "qicoimageformat"
+        PREFIX
+            "/"
+        FILES
+            ${qicoimageformat_resource_files}
+    )
+endif()
diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
index a49a4f6411..6f6aaedca5 100644
--- a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
+++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from qiconhighdpi.pro.
 
 #####################################################################
-## tst_qicon Test:
+## tst_qiconhighdpi Test:
 #####################################################################
 
 # Collect test data
diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt
index 70fad8cdc6..6951f9a703 100644
--- a/tests/auto/gui/image/qimage/CMakeLists.txt
+++ b/tests/auto/gui/image/qimage/CMakeLists.txt
@@ -24,35 +24,36 @@ add_qt_test(tst_qimage
 ## Scopes:
 #####################################################################
 
-# 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"
-)
-
-add_qt_resource(tst_qimage "qimage"
-    PREFIX
-        "/"
-    FILES
-        ${qimage_resource_files}
-)
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # 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"
+    )
 
+    add_qt_resource(tst_qimage "qimage"
+        PREFIX
+            "/"
+        FILES
+            ${qimage_resource_files}
+    )
+endif()
 
 extend_target(tst_qimage CONDITION WIN32 AND NOT WINRT
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt
index 13dc7e807a..93bf709c20 100644
--- a/tests/auto/gui/image/qimagereader/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt
@@ -50,16 +50,17 @@ add_qt_resource(tst_qimagereader "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-# Resources:
-set(android_testdata_resource_files
-    "images/kollada-noext"
-    "images/trans.gif"
-)
-
-add_qt_resource(tst_qimagereader "android_testdata"
-    PREFIX
-        "/"
-    FILES
-        ${android_testdata_resource_files}
-)
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(android_testdata_resource_files
+        "images/kollada-noext"
+        "images/trans.gif"
+    )
 
+    add_qt_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 36cfcc5cb2..1a04dfbce0 100644
--- a/tests/auto/gui/image/qimagewriter/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
@@ -24,26 +24,27 @@ add_qt_test(tst_qimagewriter
 ## Scopes:
 #####################################################################
 
-# 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"
-)
-
-add_qt_resource(tst_qimagewriter "qimagewriter"
-    PREFIX
-        "/"
-    FILES
-        ${qimagewriter_resource_files}
-)
-
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # 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"
+    )
+
+    add_qt_resource(tst_qimagewriter "qimagewriter"
+        PREFIX
+            "/"
+        FILES
+            ${qimagewriter_resource_files}
+    )
+endif()