diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-01-24 16:30:23 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-01-26 09:30:09 +0200 |
| commit | 26ea50356ca2b8567de1e6ab9a947feb67530b4f (patch) | |
| tree | a1413cb180844fc2a077ebbefbff7c00195c0f8d | |
| parent | caf7c87b416de925182a80ee4b610c964ee28446 (diff) | |
qtbase: update patch to apply cleanly
Pick-to: dev
Change-Id: I45b21135b5f2c9e3f48310b4ac29961b2dcc0109
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | recipes-qt/qt6/qtbase/0003-tests-disable-failing-tests.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt6/qtbase/0003-tests-disable-failing-tests.patch b/recipes-qt/qt6/qtbase/0003-tests-disable-failing-tests.patch index 4f362df..3455a90 100644 --- a/recipes-qt/qt6/qtbase/0003-tests-disable-failing-tests.patch +++ b/recipes-qt/qt6/qtbase/0003-tests-disable-failing-tests.patch @@ -1,4 +1,4 @@ -From 54761cb9a05db79482cea138effc6d1c33125e99 Mon Sep 17 00:00:00 2001 +From 9228d7c87b6affc60fa784ca44ac26710b28abd9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 8 Sep 2021 09:31:15 +0300 Subject: [PATCH] tests: disable failing tests @@ -12,12 +12,12 @@ Upstream-Status: Inappropriate [embedded specific] 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/gui/image/CMakeLists.txt b/tests/auto/gui/image/CMakeLists.txt -index 14930536c9..2a506aa089 100644 +index 27916d0409..cf6c86e8dc 100644 --- a/tests/auto/gui/image/CMakeLists.txt +++ b/tests/auto/gui/image/CMakeLists.txt -@@ -6,7 +6,7 @@ if(TARGET Qt::Network AND NOT ANDROID) +@@ -8,7 +8,7 @@ if(QT_FEATURE_ico) + add_subdirectory(qicoimageformat) endif() - add_subdirectory(qicoimageformat) add_subdirectory(qpixmap) -add_subdirectory(qimage) +#add_subdirectory(qimage) |