summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-02-22 14:51:05 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-04-20 10:06:37 +0000
commitf33be06035faaa59cee17e5a97e82d079b4ab444 (patch)
tree79d1a995808932b7e9fae144e2b13ddb0b4908a2 /recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch
parentc7549747b6e83e9630ae37c7e2595e41e4f1ebac (diff)
downloadmeta-qt5-f33be06035faaa59cee17e5a97e82d079b4ab444.tar.gz
qt5: upgrade to 5.11 Alpha
* use qtwebkit and qtwebkit-examples from dev branch, because there is no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in qt5-git.inc nobody noticed). * qtbase: drop qml-debug options removed from qtbase in: commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1 Author: Ulf Hermann <ulf.hermann@qt.io> Date: Fri Oct 6 16:27:09 2017 +0200 Subject: Remove qml-debug configure flag and feature * qtgraphicaleffects, qtquickcontrols2, qtquickcontrols, qtvirtualkeyboard: add qtdeclarative-native dependency needed for qmlcachegen binary * qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs referenced files disappered in: commit 6882a04fb36642862b11efe514251d32070c3d65 Author: Konstantin Tokarev <annulen@yandex.ru> Date: Thu Aug 25 19:20:41 2016 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch
index 69e05660..3d5d286d 100644
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From d760fcdd764985f05a480ba475855f92844a6f0d Mon Sep 17 00:00:00 2001 1From 3e08f22dbe2ca570bf853b6dfad8831f21ddbe14 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] chromium: Force host toolchain configuration 4Subject: [PATCH] chromium: Force host toolchain configuration
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 3 insertions(+), 3 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
15 15
16diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py 16diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py
17index b1ff7e7..bccabbb 100755 17index 43392ef..9ef521f 100755
18--- a/chromium/tools/gn/bootstrap/bootstrap.py 18--- a/chromium/tools/gn/bootstrap/bootstrap.py
19+++ b/chromium/tools/gn/bootstrap/bootstrap.py 19+++ b/chromium/tools/gn/bootstrap/bootstrap.py
20@@ -318,10 +318,10 @@ def write_gn_ninja(path, root_gen_dir, options): 20@@ -326,10 +326,10 @@ def write_gn_ninja(path, root_gen_dir, options):
21 ld = os.environ.get('LD', cxx) 21 ld = os.environ.get('LD', cxx)
22 ar = os.environ.get('AR', 'ar -X64') 22 ar = os.environ.get('AR', 'ar -X64')
23 else: 23 else: