diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 11:50:43 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 19:56:24 +0100 |
commit | f8c39026aa1510eaf62fcedc42bc687d6d8ad6ac (patch) | |
tree | e27355a2223ff85bf026d4063e9686b91f77c51b /recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | |
parent | 4d4a34c5d29ef7b730eb9da87b39f91352ef66fa (diff) | |
download | meta-qt5-f8c39026aa1510eaf62fcedc42bc687d6d8ad6ac.tar.gz |
qtwebengine: refresh patches
* drop 0001-eLinux-build-ffmpegsumo-as-well.patch which is already included in 5.4.1
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 | 12 |
1 files changed, 6 insertions, 6 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 index b19556ff..bc8a0700 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 69e05cdc9000a1962101b2859d0ae3d77bb751d7 Mon Sep 17 00:00:00 2001 | 1 | From 762c943fbe1bee878275788f376b33abce46e25a Mon Sep 17 00:00:00 2001 |
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | 2 | From: Frieder Schrempf <frieder.schrempf@online.de> |
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | 3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 |
4 | Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform |
@@ -12,18 +12,18 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
15 | index 0123336..5cea82a 100644 | 15 | index b46478b..6205bf4 100644 |
16 | --- a/tools/qmake/mkspecs/features/functions.prf | 16 | --- a/tools/qmake/mkspecs/features/functions.prf |
17 | +++ b/tools/qmake/mkspecs/features/functions.prf | 17 | +++ b/tools/qmake/mkspecs/features/functions.prf |
18 | @@ -7,7 +7,7 @@ defineTest(isPlatformSupported) { | 18 | @@ -10,7 +10,7 @@ defineTest(isPlatformSupported) { |
19 | 19 | ||
20 | linux-g++*:!isGCCVersionSupported():return(false) | 20 | linux-g++*:!isGCCVersionSupported(): return(false) |
21 | !isPythonVersionSupported(): return(false) | 21 | !isPythonVersionSupported(): return(false) |
22 | - linux-g++*|win32-msvc2013|macx-clang: return(true) | 22 | - linux-g++*|win32-msvc2013|macx-clang: return(true) |
23 | + linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true) | 23 | + linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true) |
24 | boot2qt: return(true) | 24 | boot2qt: return(true) |
25 | 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".) | 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 | -- | 27 | -- |
28 | 2.1.3 | 28 | 2.3.1 |
29 | 29 | ||