diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:42:26 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:57:32 +0200 |
| commit | f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch) | |
| tree | d0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | |
| parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff) | |
| parent | 1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff) | |
| download | meta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz | |
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits)
qtbase: Use pcre packages by default
qt5: use PACKAGECONFIG to disable tests and examples
qtlocation: use geoclue 2
qtbase: use offscreen platform plugin for tools
qtbase: add openssl PACKAGECONFIG for native nativesdk
qtbase-native: disable vulkan support
maliit-framework-qt5: fix test installations
qtenginio: remove obsolete module
ogl-runtime: update to v2.5.0 release
qtquick3d: add recipe
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qt5: Update to Qt 5.14.0
qtbase: Fix patch fuzz detected with devtool
qtbase: Backport the patch from upstream gerrit
qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
qtwebengine: Move CharAllocator definition to header
qt5-creator: Add missing dep on libz.so
qt5-creator: Make clang-format patch work with multiple clang versions
qtwebengine: Include cstddef for size_t definition
...
Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
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 12128d3c..c9df775d 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 85a1cd44983263b59942d83bd7626ed4700b29fe Mon Sep 17 00:00:00 2001 | 1 | From 998a4037e9c057c9735d8b0df57c2eca5b452d0b 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 06c93e5b3cf..8ba0f8a3109 100644 | 20 | index 7179df05451..884c9714bbb 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") { |