CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qtapplicationmanager: remove unneeded patch

Browse Source 
The fix was merged and patch is no longer needed.

Change-Id: I27f8bf0497fbbf86a4e81b5ca5a1591b4a663cbc
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
This commit is contained in:
Samuli Piippo 2022-07-08 06:03:24 +00:00
parent c2027fb867
commit 9f297583dc
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
recipes-qt/qt6/qtapplicationmanager/0001-clang-wants-C-attributes-before-a-func-declaration-n.patch
View File

@ -1,24 +0,0 @@
From 44339721d8b94f2f14e243e494a45a9bdccbe4bd Mon Sep 17 00:00:00 2001
From: Robert Griebl <robert.griebl@qt.io>
Date: Fri, 24 Jun 2022 16:36:54 +0200
Subject: [PATCH] clang wants C++ attributes before a func declaration nowadays
Change-Id: I7a537aa4b21e499ba7ca0a1d46314dce60266bfc
Pick-to: 6.4 6.3 6.2 5.15
---
src/common-lib/crashhandler.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common-lib/crashhandler.cpp b/src/common-lib/crashhandler.cpp
index 7ce7df5f..41578327 100644
--- a/src/common-lib/crashhandler.cpp
+++ b/src/common-lib/crashhandler.cpp
@@ -310,7 +310,7 @@ QT_END_NAMESPACE_AM
QT_BEGIN_NAMESPACE_AM
-static Q_NORETURN void crashHandler(const char *why, int stackFramesToIgnore);
+Q_NORETURN static void crashHandler(const char *why, int stackFramesToIgnore);
static void initBacktraceUnix()
{

2
recipes-qt/qt6/qtapplicationmanager_git.bb
View File

@ -13,8 +13,6 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "file://0001-clang-wants-C-attributes-before-a-func-declaration-n.patch"
DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native"
RDEPENDS:${PN}:class-target = "libcrypto ${PN}-tools"