summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-11-22 10:26:45 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-11-25 09:19:26 +0200
commit929b2ef266c6eb4cc1f5500f421fda449cd8900b (patch)
tree2df07f423983f7ef00c1c4c817b37416b25553ae /recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
parentfd86202d56c542011d24dc518457631bc00901c9 (diff)
parent12cc756c7948a90367473f0a52dd2fe2b519dd24 (diff)
downloadmeta-qt5-929b2ef266c6eb4cc1f5500f421fda449cd8900b.tar.gz
Merge remote-tracking branch 'qtyocto/5.13' into 5.14
* origin/5.13: 12cc756 Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.13 432ad2a qttools: don't install tst_qtattributionsscanner 8115617 qt5: Upgrade to Qt 5.13.2 267e646 python(3)-pyqt5: add qml support 653e12f libqofono: bump SRCREV and add a fix for voicecall cefb48e qtbase: Add PACKAGECONFIG for lttng 911b346 layer: Mark zeus as compatible release c373272 ogl-runtime: Fix build on x86_64 9172ba1 README.md: Document need for 32bit host compiler db2fd6c qtwayland: Fix build with clang/libc++ 6b5122e qtbase: Fix build when fp16 is used Conflicts: recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch Change-Id: I475f15bad150bbc86ed49c1c0807fe0948e60723
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
index 61d01fef..12128d3c 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
@@ -1,4 +1,4 @@
1From e7fa0c8b3c0a0a2d80180b032b1c73593e496f82 Mon Sep 17 00:00:00 2001 1From 85a1cd44983263b59942d83bd7626ed4700b29fe Mon Sep 17 00:00:00 2001
2From: Johannes Pointner <johannes.pointner@br-automation.com> 2From: Johannes Pointner <johannes.pointner@br-automation.com>
3Date: Fri, 3 May 2019 09:12:38 +0200 3Date: Fri, 3 May 2019 09:12:38 +0200
4Subject: [PATCH] chromium: Do not try to set the guessed values for 4Subject: [PATCH] chromium: Do not try to set the guessed values for
@@ -17,7 +17,7 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
17 1 file changed, 9 deletions(-) 17 1 file changed, 9 deletions(-)
18 18
19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
20index 7179df05451..884c9714bbb 100644 20index 06c93e5b3cf..8ba0f8a3109 100644
21--- a/chromium/build/config/compiler/BUILD.gn 21--- a/chromium/build/config/compiler/BUILD.gn
22+++ b/chromium/build/config/compiler/BUILD.gn 22+++ b/chromium/build/config/compiler/BUILD.gn
23@@ -774,15 +774,6 @@ config("compiler_cpu_abi") { 23@@ -774,15 +774,6 @@ config("compiler_cpu_abi") {