mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
qtapplicationmanager: remove patch
The patch is now merged upstream.
Change-Id: Iece64a6f482d478521558c79e9ec06919107d4d0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 3cef727dc8)
This commit is contained in:
parent
878d69d39d
commit
0e8ae2992f
|
|
@ -1,29 +0,0 @@
|
|||
From 37b0a11ac7ca9521b4f1446ad817ee28d2216698 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Wed, 16 Oct 2024 09:05:15 +0000
|
||||
Subject: [PATCH] Don't store build dir to the binaries
|
||||
|
||||
Storing build dir to the binaries causes QA errors:
|
||||
"contains reference to TMPDIR [buildpaths]"
|
||||
|
||||
Change-Id: Ic887b8ca5332e0bd2ddbabb22aeb386dac6e2eac
|
||||
Task-number: QTBUG-130117
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
src/main-lib/main.cpp | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
|
||||
index 1deba17d..8cd5599a 100644
|
||||
--- a/src/main-lib/main.cpp
|
||||
+++ b/src/main-lib/main.cpp
|
||||
@@ -139,9 +139,6 @@ Main::Main(int &argc, char **argv, InitFlags initFlags)
|
||||
false;
|
||||
#endif
|
||||
|
||||
- // this might be needed later on by the native runtime to find a suitable qml runtime launcher
|
||||
- setProperty("_am_build_dir", QString::fromLatin1(AM_BUILD_DIR));
|
||||
-
|
||||
UnixSignalHandler::instance()->install(UnixSignalHandler::ForwardedToEventLoopHandler,
|
||||
{ SIGINT, SIGTERM },
|
||||
[](int sig) {
|
||||
|
|
@ -13,8 +13,6 @@ inherit qt6-cmake
|
|||
include recipes-qt/qt6/qt6-git.inc
|
||||
include recipes-qt/qt6/qt6.inc
|
||||
|
||||
SRC_URI += "file://0001-Don-t-store-build-dir-to-the-binaries.patch"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native"
|
||||
DEPENDS:append:libc-musl = " libexecinfo"
|
||||
RDEPENDS:${PN}:class-target = "libcrypto ${PN}-tools"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user