mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
qtdeclarative: update patch
Pick-to: 6.3 6.2 Change-Id: I356bed7a2cd207383ec83fd8d5f6303f4f92d0e6 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
parent
8b02490cca
commit
4ff7b74454
|
|
@ -1,4 +1,4 @@
|
|||
From 6a77c14d667f3eddf77815d8f264e5c733e880f5 Mon Sep 17 00:00:00 2001
|
||||
From d98fb32ac1dc806c8fdb1d75ddbd08742fa088a2 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Fri, 17 Sep 2021 07:27:55 +0300
|
||||
Subject: [PATCH] tests: disable failing tests
|
||||
|
|
@ -11,15 +11,15 @@ Upstream-Status: Inappropriate [embedded specific]
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/auto/quickcontrols2/CMakeLists.txt b/tests/auto/quickcontrols2/CMakeLists.txt
|
||||
index b3b655f2cd..64fa495dba 100644
|
||||
index 5bd05b95ee..919fb1724a 100644
|
||||
--- a/tests/auto/quickcontrols2/CMakeLists.txt
|
||||
+++ b/tests/auto/quickcontrols2/CMakeLists.txt
|
||||
@@ -32,7 +32,7 @@ endif()
|
||||
@@ -28,7 +28,7 @@ add_subdirectory(qquickmaterialstyleconf)
|
||||
add_subdirectory(qquickmenu)
|
||||
add_subdirectory(qquickmenubar)
|
||||
add_subdirectory(qquickninepatchimage)
|
||||
if(NOT ANDROID) # QTBUG-101005
|
||||
-add_subdirectory(qquickpopup)
|
||||
+#add_subdirectory(qquickpopup)
|
||||
endif()
|
||||
add_subdirectory(qquickstyle)
|
||||
add_subdirectory(qquickuniversalstyle)
|
||||
add_subdirectory(qquickuniversalstyleconf)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user