diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 16:56:26 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-25 14:24:08 +0200 |
| commit | 8f765ed71128ecc50aa7cd464be1332658df6e10 (patch) | |
| tree | 14b6c80191dbd1a7c5ac9d22d1642e4ae0c5e276 /recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | |
| parent | 52496ed3e2ec94d1d93426a766ec93ab400bc1df (diff) | |
| download | meta-qt5-8f765ed71128ecc50aa7cd464be1332658df6e10.tar.gz | |
qt5: upgrade to latest revision in 5.5 branches
* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream
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 a533eea8..bfde82e1 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,7 +1,7 @@ | |||
| 1 | From 399990aa9b68437be7f3d6fa16556bf091645c34 Mon Sep 17 00:00:00 2001 | 1 | From b7b5fa151e1ff1749ab5b04763f0f64a156e6e48 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/4] functions.prf: allow build for linux-oe-g++ platform |
| 5 | 5 | ||
| 6 | Upstream-Status: Inappropriate [OE specific] | 6 | Upstream-Status: Inappropriate [OE specific] |
| 7 | 7 | ||
| @@ -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 aec54ea..6a4b01f 100644 | 15 | index e71e6e4..2161505 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 | @@ -14,7 +14,7 @@ defineTest(isPlatformSupported) { | 18 | @@ -14,7 +14,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 | skipBuild("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.4.2 | 28 | 2.5.3 |
| 29 | 29 | ||