diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-03-22 11:22:40 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-03-22 11:24:29 +0200 |
| commit | 96c81ec5cc7cf58a934c5c871156d1a54f83dff3 (patch) | |
| tree | c98511e41c8694b4d6c975ce550c94fd9324a8e1 /recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch | |
| parent | 30e3be7d69820952bc03c80c9cb9bf81ee7d80c7 (diff) | |
| parent | 190e326fb3f15f2d0ca93dfa4815f4050cf44f25 (diff) | |
Merge remote-tracking branch 'upstream/master' into lts-5.15
Changelog:
190e326f qtbase: Readd missing objcopy in linux-oe mkspecs
a7b4c5a5 qtvirtualkeyboard: Fix build when std=c++17
2c7ddcef .patch: Add missing Upstream-Status and Signed-off-by
819bf30f qttools,tufao: fix Upstream-Status formatting
Conflicts:
recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch
recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch
recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch
Change-Id: Id07a1351cac96b0e3a868e6b12042c7668a14b69
Diffstat (limited to 'recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch')
| -rw-r--r-- | recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch index 3ee3fda6..32de7de1 100644 --- a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch +++ b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch @@ -5,6 +5,7 @@ Subject: [PATCH] src.pro: Add option noqdoc to disable qdoc builds it needs clang on host, so lets separate it out +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/src.pro | 2 +- |