32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
From 89c132829d1a93d662f617c2a7be75c5e6eaa33a Mon Sep 17 00:00:00 2001
|
|
From: Trevor Woerner <trevor.woerner@linaro.org>
|
|
Date: Fri, 7 Feb 2014 04:07:17 +0100
|
|
Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
|
|
|
|
Building qtwebkit causes a QA issue such that QtWebPluginProcess and
|
|
QtWebProcess contain bad RPATHs which point into the build location. This fix
|
|
adds a patch to not include the rpath.prf which causes this problem.
|
|
|
|
Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
---
|
|
Tools/qmake/mkspecs/features/unix/default_post.prf | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
|
|
index 79b7208..6dff72b 100644
|
|
--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
|
|
+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
|
|
@@ -58,8 +58,6 @@ linux-*g++* {
|
|
QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
|
|
}
|
|
|
|
-contains(TEMPLATE, app): CONFIG += rpath
|
|
-
|
|
CONFIG(debug, debug|release)|force_debug_info|separate_debug_info {
|
|
# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
|
|
!force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory
|
|
--
|
|
1.8.5.3
|
|
|