mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
qttools: remove merged patch
The fix was merged in upstream. Change-Id: I177595444e1b6a960894648e6a296377e1498a79 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
parent
ca31cae96a
commit
b637f4fb72
|
|
@ -1,25 +0,0 @@
|
|||
From f4b0fc8061e30edbaf7a9b23827cebfadccdd2f4 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 385d651ec..73f207720 100644
|
||||
--- a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
|
||||
+++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
|
||||
@@ -1487,7 +1487,6 @@ static const char *defaultArgs_[] = {
|
||||
"-Wno-nullability-completeness",
|
||||
"-fvisibility=default",
|
||||
"-ferror-limit=0",
|
||||
- ("-I" CLANG_RESOURCE_DIR)
|
||||
};
|
||||
|
||||
/*!
|
||||
|
|
@ -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 \
|
||||
"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user