qtapplicationmanager: remove patch

The patch is now merged upstream.

Pick-to: dev
Change-Id: Iece64a6f482d478521558c79e9ec06919107d4d0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Mikko Gronoff 2024-11-01 08:26:35 +02:00
parent 91ef10ca10
commit 3cef727dc8
2 changed files with 0 additions and 31 deletions

View File

@ -1,29 +0,0 @@
From e16e843dbcb67d7262379ac131ce3867d0ec169d 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 28a5e3eb..e51eb466 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -141,9 +141,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));
-
static bool once = false;
if (!once) {
once = true;

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-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"