From 49bfeff2bf7650f1bf30d54807ee8f2f4afb839a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 28 Jun 2022 14:54:00 +0300 Subject: [PATCH] qtdeclarative: enable tests that failed with gold linker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove patch that was used to disable tests failing to build with gold linker. After qtbase commit 40c8bc42026a8cf118ab60920314d84856c397a6, the long stanging issue with gold linker and qt_version_tag symbol [1] seems to be resolved. [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=842304 Pick-to: 6.4 Change-Id: I522b101929c99ebe35fcb6948be46c85b07eefd2 Reviewed-by: Pasi Petäjäjärvi --- .../0001-tests-disable-failing-tests.patch | 25 ------------------- recipes-qt/qt6/qtdeclarative_git.bb | 4 --- 2 files changed, 29 deletions(-) delete mode 100644 recipes-qt/qt6/qtdeclarative/0001-tests-disable-failing-tests.patch diff --git a/recipes-qt/qt6/qtdeclarative/0001-tests-disable-failing-tests.patch b/recipes-qt/qt6/qtdeclarative/0001-tests-disable-failing-tests.patch deleted file mode 100644 index a53a10e..0000000 --- a/recipes-qt/qt6/qtdeclarative/0001-tests-disable-failing-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d98fb32ac1dc806c8fdb1d75ddbd08742fa088a2 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 17 Sep 2021 07:27:55 +0300 -Subject: [PATCH] tests: disable failing tests - -Some of the tests fail to link with gold linker used. - -Upstream-Status: Inappropriate [embedded specific] ---- - tests/auto/quickcontrols2/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/auto/quickcontrols2/CMakeLists.txt b/tests/auto/quickcontrols2/CMakeLists.txt -index 5bd05b95ee..919fb1724a 100644 ---- a/tests/auto/quickcontrols2/CMakeLists.txt -+++ b/tests/auto/quickcontrols2/CMakeLists.txt -@@ -28,7 +28,7 @@ add_subdirectory(qquickmaterialstyleconf) - add_subdirectory(qquickmenu) - add_subdirectory(qquickmenubar) - add_subdirectory(qquickninepatchimage) --add_subdirectory(qquickpopup) -+#add_subdirectory(qquickpopup) - add_subdirectory(qquickstyle) - add_subdirectory(qquickuniversalstyle) - add_subdirectory(qquickuniversalstyleconf) diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb index c0d7143..75541a2 100644 --- a/recipes-qt/qt6/qtdeclarative_git.bb +++ b/recipes-qt/qt6/qtdeclarative_git.bb @@ -15,10 +15,6 @@ inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc -SRC_URI += "\ - file://0001-tests-disable-failing-tests.patch \ -" - DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver" BBCLASSEXTEND = "native nativesdk"