diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:44:26 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:45:10 +0200 |
| commit | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch) | |
| tree | 5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | |
| parent | 3e502778ee161bef4177e7e7f45c0c9b78d047da (diff) | |
| parent | 432ad2aa6c3a13253fefc909faba368851d21fb1 (diff) | |
| download | meta-qt5-12cc756c7948a90367473f0a52dd2fe2b519dd24.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus:
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/ogl-runtime_git.bb
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
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.patch | 4 |
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 d8eca0c6..4e976b42 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 @@ | |||
| 1 | From 27d1c407b98979445e216c6fd105e78014e928b1 Mon Sep 17 00:00:00 2001 | 1 | From 85a1cd44983263b59942d83bd7626ed4700b29fe Mon Sep 17 00:00:00 2001 |
| 2 | From: Johannes Pointner <johannes.pointner@br-automation.com> | 2 | From: Johannes Pointner <johannes.pointner@br-automation.com> |
| 3 | Date: Fri, 3 May 2019 09:12:38 +0200 | 3 | Date: Fri, 3 May 2019 09:12:38 +0200 |
| 4 | Subject: [PATCH] chromium: Do not try to set the guessed values for | 4 | Subject: [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 | ||
| 19 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn | 19 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn |
| 20 | index 6f2eff6f5ef..57a950a435a 100644 | 20 | index 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 | @@ -809,15 +809,6 @@ config("compiler_cpu_abi") { | 23 | @@ -809,15 +809,6 @@ config("compiler_cpu_abi") { |