1 files changed, 11 insertions, 38 deletions
diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt
index 4c95b32e48..8d0842026d 100644
--- a/tests/auto/gui/image/qimage/CMakeLists.txt
+++ b/tests/auto/gui/image/qimage/CMakeLists.txt
@@ -1,9 +1,16 @@
-# Generated from qimage.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qimage Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qimage LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 # Collect test data
 file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -13,54 +20,20 @@ list(APPEND test_data ${test_data_glob})
 qt_internal_add_test(tst_qimage
     SOURCES
         tst_qimage.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
     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
+    LIBRARIES
         gdi32
         user32
 )
 
 qt_internal_extend_target(tst_qimage CONDITION APPLE
-    PUBLIC_LIBRARIES
+    LIBRARIES
         ${FWCoreGraphics}
 )