diff options
author | Jonathan Liu <net147@gmail.com> | 2014-12-11 15:52:18 +1100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-11 13:24:22 +0100 |
commit | 6566f728ab3d14a4908516fb13ad555dbfe04471 (patch) | |
tree | d73319dd12e71d434c01b25d04f9b5c84a5c83cc /recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch | |
parent | c9a1041cb956d94c04cbf635b00ca19725ffc129 (diff) | |
download | meta-qt5-6566f728ab3d14a4908516fb13ad555dbfe04471.tar.gz |
recipes: upgrade from 5.3.2 to 5.4.0
MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch b/recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch deleted file mode 100644 index a3842ecd..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-Set-arm_tune-to-empty-string-if-mtune-flag-is-not-se.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From c99aed6ef28c4ac9c00024a40222331c0e682d28 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andras Becsi <andras.becsi@digia.com> | ||
3 | Date: Thu, 18 Sep 2014 18:22:37 +0200 | ||
4 | Subject: [PATCH 4/6] Set arm_tune to empty string if mtune flag is not set by | ||
5 | toolchain | ||
6 | |||
7 | Since the default arm_tune option applied by chromium is not | ||
8 | recognized by our gcc toolchain set arm_tune to empty string | ||
9 | to prevent chromium from setting a default. Our toolchains | ||
10 | set the arm version which already implies the corresponding | ||
11 | mtune option anyway. | ||
12 | |||
13 | Change-Id: I0291bd4f0e5706597d37f914e4eeefbd75397bbf | ||
14 | Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> | ||
15 | --- | ||
16 | src/core/gyp_run.pro | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro | ||
20 | index ed592e1..4845af2 100644 | ||
21 | --- a/src/core/gyp_run.pro | ||
22 | +++ b/src/core/gyp_run.pro | ||
23 | @@ -47,7 +47,7 @@ cross_compile { | ||
24 | !isEmpty(MARCH): GYP_ARGS += "-D arm_arch=\"$$MARCH\"" | ||
25 | |||
26 | MTUNE = $$extractCFlag("-mtune=.*") | ||
27 | - !isEmpty(MTUNE): GYP_ARGS += "-D arm_tune=\"$$MTUNE\"" | ||
28 | + GYP_ARGS += "-D arm_tune=\"$$MTUNE\"" | ||
29 | |||
30 | MFLOAT = $$extractCFlag("-mfloat-abi=.*") | ||
31 | !isEmpty(MFLOAT): GYP_ARGS += "-D arm_float_abi=\"$$MFLOAT\"" | ||
32 | -- | ||
33 | 2.1.1 | ||
34 | |||