diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-05-19 11:29:35 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-05-31 22:59:43 +0300 |
commit | 8243172c5ddbb0ede701a241e86d5ec903d1e44d (patch) | |
tree | c5b3a60c6950f2fc840d0b514cc323f005cfec19 /recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch | |
parent | 04b592b904c931aa0adf804e44693e285c3ac515 (diff) |
qt5: update submodulesv5.15.10-lts
Update to latest content in Qt 5.15.10 branch.
Task-number: QTBUG-102791
Change-Id: I17757aa9864b07aef02c2244951fe04ab8162709
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch')
-rw-r--r-- | recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch index 87d26ac0..f3e2d942 100644 --- a/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch +++ b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch @@ -1,4 +1,4 @@ -From 4d2f525ccf3255dd4a0e774d3db0533ae4aba98f Mon Sep 17 00:00:00 2001 +From 8a15c966acb8767137d181d3792b685b65522edb Mon Sep 17 00:00:00 2001 From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com> Date: Tue, 8 Feb 2022 16:28:14 +0100 Subject: [PATCH] gn.pro: do not try to statically link stdc++ @@ -8,7 +8,7 @@ Subject: [PATCH] gn.pro: do not try to statically link stdc++ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro -index a8ca6567..9632f0ef 100644 +index a8ca6567b..9632f0ef7 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -20,7 +20,8 @@ build_pass|!debug_and_release { |