summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-16 15:55:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-16 16:47:41 (GMT)
commit98ce344d1822f15ee522d239e0085479c2a7e341 (patch)
tree3e556f15298206b142d7aeb3d6ae709e328c0043 /meta/recipes-qt
parentbe0f9dd483af2a2f55b2ae8ef9ca172e7c90819c (diff)
downloadpoky-98ce344d1822f15ee522d239e0085479c2a7e341.tar.gz
qt-mobility: fix QA warnings
Fix the following warnings: WARNING: QA Issue: package qt-mobility-x11 contains bad RPATH /home/user/qt/lib:/home/user/qt/lib${WORKDIR}/qt-mobility-opensource-src-1.2.0/lib:/home/user/qt/lib/media/large/tmp/sysroots/qemux86/usr/lib:/home/user/qt/lib/usr/lib in file ${WORKDIR}/packages-split/qt-mobility-x11/usr/bin/qt4/examples/QtMobility/qml_device WARNING: QA Issue: package qt-mobility-x11 contains bad RPATH /home/user/qt/lib:/home/user/qt/lib${WORKDIR}/qt-mobility-opensource-src-1.2.0/lib:/home/user/qt/lib/media/large/tmp/sysroots/qemux86/usr/lib:/home/user/qt/lib/usr/lib in file ${WORKDIR}/packages-split/qt-mobility-x11/usr/bin/qt4/examples/QtMobility/qml_device (From OE-Core rev: de5a8e843d85b4d08cc5b75ec10709e96a709a90) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch28
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc5
2 files changed, 31 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch b/meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
new file mode 100644
index 0000000..a411640
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
@@ -0,0 +1,28 @@
1From 92e0c611f4969c716616d64df64831387e5b1632 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Fri, 16 Mar 2012 10:24:00 +0000
4Subject: [PATCH] Remove unnecessary rpaths from qml_device example
5
6These can't be valid in any case.
7
8Upstream-Status: Pending
9
10Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
11---
12 examples/declarative-systeminfo/device/device.pro | 3 ---
13 1 files changed, 0 insertions(+), 3 deletions(-)
14
15diff --git a/examples/declarative-systeminfo/device/device.pro b/examples/declarative-systeminfo/device/device.pro
16index 698e5fb..05be9b7 100644
17--- a/examples/declarative-systeminfo/device/device.pro
18+++ b/examples/declarative-systeminfo/device/device.pro
19@@ -17,6 +17,3 @@ symbian {
20 }
21 RESOURCES += device.qrc
22
23-QMAKE_LFLAGS_DEBUG += "-Wl,-rpath,/home/user/qt/lib"
24-QMAKE_LFLAGS_RPATH += "-Wl,-rpath,/home/user/qt/lib"
25-QMAKE_LFLAGS_RELEASE += "-Wl,-rpath,/home/user/qt/lib"
26--
271.7.5.4
28
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index 593cbd6..1c4611d 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -7,12 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
7 7
8SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \ 8SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
9 file://qt-mobility-configure.patch \ 9 file://qt-mobility-configure.patch \
10 file://0001-gstvideoconnector-fixed-buffers-allocation.patch" 10 file://0001-gstvideoconnector-fixed-buffers-allocation.patch \
11 file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch"
11 12
12SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" 13SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
13SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44" 14SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
14 15
15PR = "r2" 16PR = "r3"
16 17
17S = "${WORKDIR}/qt-mobility-opensource-src-${PV}" 18S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
18 19