diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-19 15:26:34 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-11-11 13:24:53 +0100 |
commit | 178a817e6f4604e0f4b24a416d5e83b428cbabe7 (patch) | |
tree | 52cbe707471b8ca0002d315c9b970e994854b498 /recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | |
parent | f39bc18eae46e0df30580f0e5992d069f9c881be (diff) | |
download | meta-qt5-178a817e6f4604e0f4b24a416d5e83b428cbabe7.tar.gz |
qt5: upgrade to latest revision in 5.6 branch (5.6.0-alpha1+)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch deleted file mode 100644 index 23be4890..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From a7bb8e37abb3a11e6257d6e154d33c7af5856dcc 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/4] 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 04bdba5..4206661 100644 | ||
16 | --- a/tools/qmake/mkspecs/features/functions.prf | ||
17 | +++ b/tools/qmake/mkspecs/features/functions.prf | ||
18 | @@ -14,7 +14,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 | skipBuild("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.6.1 | ||
29 | |||