diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-29 05:48:44 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-04 04:25:11 +0200 |
commit | be2d4815efd7b8312700a426a5cafcd86a93666b (patch) | |
tree | ef3c3ed2e3092535fe0e4a14d2834c1ccbd72d19 /recipes-qt/qt5/qtwebkit-git | |
parent | 096112d4ab8bad1c45ab0bc40354d9a9bb3e097d (diff) | |
download | meta-qt5-be2d4815efd7b8312700a426a5cafcd86a93666b.tar.gz |
qt5: upgrade git recipes to 5.4-alpha1
* introduce 2nd set of qtwayland and qtwebengine recipes, because newer
revision isn't compatible with 5.3.2 release
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit-git')
-rw-r--r-- | recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch new file mode 100644 index 00000000..2c471be5 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From a7d860fbc194c46591016ba41e138eadc1e50d84 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Woerner <trevor.woerner@linaro.org> | ||
3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 | ||
4 | Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) | ||
5 | |||
6 | Building qtwebkit causes a QA issue such that QtWebPluginProcess and | ||
7 | QtWebProcess contain bad RPATHs which point into the build location. This fix | ||
8 | adds a patch to not include the rpath.prf which causes this problem. | ||
9 | |||
10 | Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | Tools/qmake/mkspecs/features/unix/default_post.prf | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
17 | index 9c52406..a68a101 100644 | ||
18 | --- a/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
19 | +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
20 | @@ -59,7 +59,6 @@ linux-*g++* { | ||
21 | } | ||
22 | } | ||
23 | |||
24 | -contains(TEMPLATE, app): CONFIG += rpath | ||
25 | |||
26 | CONFIG(debug, debug|release)|force_debug_info { | ||
27 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. | ||
28 | -- | ||
29 | 2.1.1 | ||
30 | |||