diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-11-27 13:48:38 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-09 11:06:30 +0100 |
commit | 54c44443c34f077bfc2c5cc3a92d6db59d28343c (patch) | |
tree | 479cd0ba85d55e8d01ae1396bca7397880360b70 /recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | |
parent | 5b8f470597d4f163952f3b63a8ee39a2ccabfe4c (diff) | |
download | meta-qt5-54c44443c34f077bfc2c5cc3a92d6db59d28343c.tar.gz |
qt5-git: Update to rc1+, latest revision in 5.4 branch
* qtwebengine LIC_FILES_CHKSUM updated because of Copyright
year update in chromium's LICENSE
< // Copyright (c) 2013 The Chromium Authors. All rights reserved.
and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because
it was including also few #include lines which were changed recently
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch new file mode 100644 index 00000000..b19556ff --- /dev/null +++ b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 69e05cdc9000a1962101b2859d0ae3d77bb751d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | ||
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | ||
4 | Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE specific] | ||
7 | |||
8 | Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de> | ||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | tools/qmake/mkspecs/features/functions.prf | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | ||
15 | index 0123336..5cea82a 100644 | ||
16 | --- a/tools/qmake/mkspecs/features/functions.prf | ||
17 | +++ b/tools/qmake/mkspecs/features/functions.prf | ||
18 | @@ -7,7 +7,7 @@ defineTest(isPlatformSupported) { | ||
19 | |||
20 | linux-g++*:!isGCCVersionSupported():return(false) | ||
21 | !isPythonVersionSupported(): return(false) | ||
22 | - linux-g++*|win32-msvc2013|macx-clang: return(true) | ||
23 | + linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true) | ||
24 | boot2qt: return(true) | ||
25 | |||
26 | warning("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation".) | ||
27 | -- | ||
28 | 2.1.3 | ||
29 | |||