diff options
author | Jonathan Liu <net147@gmail.com> | 2014-12-11 15:52:18 +1100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-11 13:24:22 +0100 |
commit | 6566f728ab3d14a4908516fb13ad555dbfe04471 (patch) | |
tree | d73319dd12e71d434c01b25d04f9b5c84a5c83cc /recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | |
parent | c9a1041cb956d94c04cbf635b00ca19725ffc129 (diff) | |
download | meta-qt5-6566f728ab3d14a4908516fb13ad555dbfe04471.tar.gz |
recipes: upgrade from 5.3.2 to 5.4.0
MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index 4073319a..9324da9a 100644 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | |||
@@ -9,23 +9,21 @@ adds a patch to not include the rpath.prf which causes this problem. | |||
9 | 9 | ||
10 | Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> | 10 | Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> |
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
12 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
12 | --- | 13 | --- |
13 | Tools/qmake/mkspecs/features/unix/default_post.prf | 2 -- | 14 | Tools/qmake/mkspecs/features/unix/default_post.prf | 2 -- |
14 | 1 file changed, 2 deletions(-) | 15 | 1 file changed, 2 deletions(-) |
15 | 16 | ||
16 | diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf | 17 | diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf |
17 | index 75df1c5..5d9a4d2 100644 | 18 | index 9c52406..7ece013 100644 |
18 | --- a/Tools/qmake/mkspecs/features/unix/default_post.prf | 19 | --- a/Tools/qmake/mkspecs/features/unix/default_post.prf |
19 | +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf | 20 | +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf |
20 | @@ -56,8 +56,6 @@ linux-*g++* { | 21 | @@ -59,8 +59,6 @@ linux-*g++* { |
21 | } | 22 | } |
22 | } | 23 | } |
23 | 24 | ||
24 | -contains(TEMPLATE, app): CONFIG += rpath | 25 | -contains(TEMPLATE, app): CONFIG += rpath |
25 | - | 26 | - |
26 | CONFIG(debug, debug|release)|force_debug_info|separate_debug_info { | 27 | 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 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. |
28 | !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory | 29 | !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory |
29 | -- | ||
30 | 2.1.1 | ||
31 | |||