diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2024-01-12 18:49:40 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2024-01-16 23:17:32 +0100 |
| commit | 076026fd60dfa399158498e42ee1b5000174c65e (patch) | |
| tree | 46511e06bccd5fd4d95393199ef21a419fe74c83 /tests/manual | |
| parent | 72b03e268d3ed23c7b83c71877a18000578c2d41 (diff) | |
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.7 6.6
Fixes: QTBUG-120732
Change-Id: I24de59fd88fdc2a3317c91ac28cf81fd5511455f
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/qimagereader/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/manual/qimagereader/main.cpp | 6 | ||||
| -rw-r--r-- | tests/manual/qimagereader/qimagereader.pro | 1 | ||||
| -rw-r--r-- | tests/manual/qimagereader/qimagereader.qrc | 5 |
4 files changed, 18 insertions, 3 deletions
diff --git a/tests/manual/qimagereader/CMakeLists.txt b/tests/manual/qimagereader/CMakeLists.txt index 60a111c82e..abfd7c6697 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 9c2111ca20..15dd88d8fc 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 3523257f3e..9a5ad4de13 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 0000000000..30a11fd17d --- /dev/null +++ b/tests/manual/qimagereader/qimagereader.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/" > + <file>Qt_logostrap_CMYK.jpg</file> + </qresource> +</RCC> |