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

qttools: remove merged patch

Browse Source 
The fix was merged in upstream.

Pick-to: 6.8
Change-Id: I177595444e1b6a960894648e6a296377e1498a79
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2024-11-21 05:48:27 +00:00
parent 7dec315566
commit 1845a8d66d
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
recipes-qt/qt6/qttools/0001-qdoc-remove-buildpath-from-default-args.patch
View File

@ -1,25 +0,0 @@
From 3b7e6528d8beb5113a165bbfc4a10e6329bb3924 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 17 Oct 2024 10:52:56 +0000
Subject: [PATCH] qdoc: remove buildpath from default args
QDoc stored buildtime path in the code that leads to QA issues.
Task-number: QTBUG-130282
Upstream-Status: Pending
---
src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
index fad044a2e..b3103ec7f 100644
--- a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
@@ -1509,7 +1509,6 @@ static const char *defaultArgs_[] = {
"-Wno-nullability-completeness",
"-fvisibility=default",
"-ferror-limit=0",
- ("-I" CLANG_RESOURCE_DIR),
"-xc++"
};

1
recipes-qt/qt6/qttools_git.bb
View File

@ -20,7 +20,6 @@ include recipes-qt/qt6/qt6.inc
SRC_URI += " \
${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \
git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml;protocol=https \
file://0001-qdoc-remove-buildpath-from-default-args.patch \
file://0002-examples-don-t-track-source-path.patch \
"