From b08c3af998b6ff72e68cdb1a1a02efc1882aa7ed Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Fri, 12 Jan 2024 18:49:40 +0100
Subject: [PATCH] QImageReader test: add test image to qrc file

Add the test image to the qrc to make sure the image is available no
matter where the test is executed.

Pick-to: 6.6
Fixes: QTBUG-120732
Change-Id: I24de59fd88fdc2a3317c91ac28cf81fd5511455f
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 076026fd60dfa399158498e42ee1b5000174c65e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/manual/qimagereader/CMakeLists.txt   | 9 +++++++++
 tests/manual/qimagereader/main.cpp         | 6 +++---
 tests/manual/qimagereader/qimagereader.pro | 1 +
 tests/manual/qimagereader/qimagereader.qrc | 5 +++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 tests/manual/qimagereader/qimagereader.qrc

diff --git a/tests/manual/qimagereader/CMakeLists.txt b/tests/manual/qimagereader/CMakeLists.txt
index 60a111c82eb..abfd7c66974 100644
--- a/tests/manual/qimagereader/CMakeLists.txt
+++ b/tests/manual/qimagereader/CMakeLists.txt
@@ -13,3 +13,12 @@ qt_internal_add_manual_test(qimagereader
         Qt::Gui
         Qt::Widgets
 )
+set(qimagereader_resource_files
+    "Qt_logostrap_CMYK.jpg"
+)
+qt_add_resources(qimagereader "qimagereader"
+    PREFIX
+        "/"
+    FILES
+        ${qimagereader_resource_files}
+)
diff --git a/tests/manual/qimagereader/main.cpp b/tests/manual/qimagereader/main.cpp
index 9c2111ca20d..15dd88d8fcb 100644
--- a/tests/manual/qimagereader/main.cpp
+++ b/tests/manual/qimagereader/main.cpp
@@ -17,7 +17,7 @@ public:
 
     }
 
-    virtual void paintEvent(QPaintEvent * /*event*/)
+    void paintEvent(QPaintEvent * /*event*/) override
     {
         QPainter painter(this);
         QImageReader reader(fileName);
@@ -54,8 +54,8 @@ int main(int argc, char** argv)
     mainWidget.setWindowTitle("Colors in images are identical?");
     mainWidget.setMinimumSize(400,400);
     QHBoxLayout *l = new QHBoxLayout;
-    MyWidget *w1 = new MyWidget(&mainWidget,"Qt_logostrap_CMYK.jpg", false);
-    MyWidget *w2 = new MyWidget(&mainWidget,"Qt_logostrap_CMYK.jpg", true);
+    MyWidget *w1 = new MyWidget(&mainWidget,":/Qt_logostrap_CMYK.jpg", false);
+    MyWidget *w2 = new MyWidget(&mainWidget,":/Qt_logostrap_CMYK.jpg", true);
     l->addWidget(w1);
     l->addWidget(w2);
     mainWidget.setLayout(l);
diff --git a/tests/manual/qimagereader/qimagereader.pro b/tests/manual/qimagereader/qimagereader.pro
index 3523257f3e2..9a5ad4de13d 100644
--- a/tests/manual/qimagereader/qimagereader.pro
+++ b/tests/manual/qimagereader/qimagereader.pro
@@ -1,2 +1,3 @@
 QT += widgets
 SOURCES += main.cpp
+RESOURCES += qimagereader.qrc
diff --git a/tests/manual/qimagereader/qimagereader.qrc b/tests/manual/qimagereader/qimagereader.qrc
new file mode 100644
index 00000000000..30a11fd17d5
--- /dev/null
+++ b/tests/manual/qimagereader/qimagereader.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>Qt_logostrap_CMYK.jpg</file>
+    </qresource>
+</RCC>