t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-06-21 08:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtbase-native: Reduce TMPDIR QA false positives for rcc generated files

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller
2022-10-15 16:01:41 +02:00
committed by Martin Jansa
parent f77b7c7068
commit f758c34ead
8 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
recipes-qt/qt5/nativesdk-qtbase_git.bb
View File

@@ -25,7 +25,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
# common for qtbase-native, qtbase-nativesdk and qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared
# 5.15.meta-qt5-shared.3
# 5.15.meta-qt5-shared.4
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -47,14 +47,16 @@ SRC_URI += "\
file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \
file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \
file://0020-qbytearraymatcher-Include-limits-header.patch \
file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \
file://0022-testlib-don-t-track-the-build-or-source-directories.patch \
"
# common for qtbase-native and nativesdk-qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native
# 5.15.meta-qt5-native.3
# 5.15.meta-qt5-native.4
SRC_URI += " \
file://0021-Always-build-uic-and-qvkgen.patch \
file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \
file://0023-Always-build-uic-and-qvkgen.patch \
file://0024-Avoid-renameeat2-for-native-sdk-builds.patch \
"
# CMake's toolchain configuration of nativesdk-qtbase

12
recipes-qt/qt5/qtbase-native_git.bb
View File

@@ -18,7 +18,7 @@ require qt5-git.inc
# common for qtbase-native, qtbase-nativesdk and qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared
# 5.15.meta-qt5-shared.3
# 5.15.meta-qt5-shared.4
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -40,19 +40,21 @@ SRC_URI += "\
file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \
file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \
file://0020-qbytearraymatcher-Include-limits-header.patch \
file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \
file://0022-testlib-don-t-track-the-build-or-source-directories.patch \
"
# common for qtbase-native and nativesdk-qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native
# 5.15.meta-qt5-native.3
# 5.15.meta-qt5-native.4
SRC_URI += " \
file://0021-Always-build-uic-and-qvkgen.patch \
file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \
file://0023-Always-build-uic-and-qvkgen.patch \
file://0024-Avoid-renameeat2-for-native-sdk-builds.patch \
"
# only for qtbase-native
SRC_URI += " \
file://0023-Bootstrap-without-linkat-feature.patch \
file://0025-Bootstrap-without-linkat-feature.patch \
"
CLEANBROKEN = "1"

29
recipes-qt/qt5/qtbase/0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch Normal file
View File

@@ -0,0 +1,29 @@
From a2b11501812e0e34bd49b1950bac52dadd4e3cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 15 Oct 2022 15:50:34 +0200
Subject: [PATCH] rcc: Just dcument file name without full path to reduce qa
warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/tools/rcc/rcc.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index c5e3d2ae4c..2d76cfd081 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -344,7 +344,7 @@ qint64 RCCFileInfo::writeDataBlob(RCCResourceLibrary &lib, qint64 offset,
// some info
if (text || pass1) {
lib.writeString(" // ");
- lib.writeByteArray(m_fileInfo.absoluteFilePath().toLocal8Bit());
+ lib.writeByteArray(m_fileInfo.baseName().toLocal8Bit());
lib.writeString("\n ");
}

2
recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch → recipes-qt/qt5/qtbase/0022-testlib-don-t-track-the-build-or-source-directories.patch
View File

@@ -1,4 +1,4 @@
From 8b2ff0bb21fa447d4383aa5c749f3dcec52fe525 Mon Sep 17 00:00:00 2001
From 7d4da27df6ab641390de75dd7c04b755295a653b Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 22 Aug 2022 15:01:28 +0300
Subject: [PATCH] testlib: don't track the build or source directories

2
recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch → recipes-qt/qt5/qtbase/0023-Always-build-uic-and-qvkgen.patch
View File

@@ -1,4 +1,4 @@
From 418c46b025edadc142ac60a6eb4c553dad19efed Mon Sep 17 00:00:00 2001
From 5f415fb09ea64765e60d1d52721064f53545a413 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 16 Nov 2013 00:32:30 +0100
Subject: [PATCH] Always build uic and qvkgen

2
recipes-qt/qt5/qtbase/0022-Avoid-renameeat2-for-native-sdk-builds.patch → recipes-qt/qt5/qtbase/0024-Avoid-renameeat2-for-native-sdk-builds.patch
View File

@@ -1,4 +1,4 @@
From 9ff02d5ebc1d0969306c57cbf77df861ec3924fc Mon Sep 17 00:00:00 2001
From 77196464454a1c66e57ad5aac237a55de211a107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 14 Apr 2019 13:27:58 +0200
Subject: [PATCH] Avoid renameeat2 for native(sdk) builds

2
recipes-qt/qt5/qtbase/0023-Bootstrap-without-linkat-feature.patch → recipes-qt/qt5/qtbase/0025-Bootstrap-without-linkat-feature.patch
View File

@@ -1,4 +1,4 @@
From f992d0551cd14c11fdb61511ac1d36ecf853089a Mon Sep 17 00:00:00 2001
From a052a876d0639db2f919aada2ae0afe1718928af Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 24 Nov 2017 15:16:31 +0200
Subject: [PATCH] Bootstrap without linkat feature

5
recipes-qt/qt5/qtbase_git.bb
View File

@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
# common for qtbase-native, qtbase-nativesdk and qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared
# 5.15.meta-qt5-shared.3
# 5.15.meta-qt5-shared.4
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -36,7 +36,8 @@ SRC_URI += "\
file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \
file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \
file://0020-qbytearraymatcher-Include-limits-header.patch \
file://0005-testlib-don-t-track-the-build-or-source-directories.patch \
file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \
file://0022-testlib-don-t-track-the-build-or-source-directories.patch \
"
# Disable LTO for now, QT5 patches are being worked upstream, perhaps revisit with