From 60c22f05e9d37744d65dc51a752a1cf2aa0a383b Mon Sep 17 00:00:00 2001 From: Janne Juntunen Date: Fri, 7 Jan 2022 15:32:51 +0200 Subject: [PATCH] tst_QIcoImageFormat: move the test behind a feature flag Do not build and run tst_QIcoImageFormat when QT_FEATURE_ico is disabled. This test was failing on webOS since there is no imageformatplugin for .ico when the feature is disabled. Fixes: QTBUG-99633 Pick-to: 6.3 Change-Id: I410b351f773639c0c29e09d4d0b5bc6da13df1d9 Reviewed-by: Eirik Aavitsland --- tests/auto/gui/image/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/auto/gui/image/CMakeLists.txt b/tests/auto/gui/image/CMakeLists.txt index 14930536c93..27916d04098 100644 --- a/tests/auto/gui/image/CMakeLists.txt +++ b/tests/auto/gui/image/CMakeLists.txt @@ -4,7 +4,9 @@ if(TARGET Qt::Network AND NOT ANDROID) add_subdirectory(qimagereader) endif() -add_subdirectory(qicoimageformat) +if(QT_FEATURE_ico) + add_subdirectory(qicoimageformat) +endif() add_subdirectory(qpixmap) add_subdirectory(qimage) add_subdirectory(qimageiohandler)