From 1845a8d66d9e12772a515de6c24fe54f946b5256 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 21 Nov 2024 05:48:27 +0000 Subject: [PATCH] qttools: remove merged patch The fix was merged in upstream. Pick-to: 6.8 Change-Id: I177595444e1b6a960894648e6a296377e1498a79 Reviewed-by: Mikko Gronoff --- ...c-remove-buildpath-from-default-args.patch | 25 ------------------- recipes-qt/qt6/qttools_git.bb | 1 - 2 files changed, 26 deletions(-) delete mode 100644 recipes-qt/qt6/qttools/0001-qdoc-remove-buildpath-from-default-args.patch diff --git a/recipes-qt/qt6/qttools/0001-qdoc-remove-buildpath-from-default-args.patch b/recipes-qt/qt6/qttools/0001-qdoc-remove-buildpath-from-default-args.patch deleted file mode 100644 index 87ed226..0000000 --- a/recipes-qt/qt6/qttools/0001-qdoc-remove-buildpath-from-default-args.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3b7e6528d8beb5113a165bbfc4a10e6329bb3924 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -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++" - }; - diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index 34e5d41..d31ad1b 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -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 \ "