diff options
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 5 |
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 000000000..a411640b7 --- /dev/null +++ b/meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch @@ -0,0 +1,28 @@ +From 92e0c611f4969c716616d64df64831387e5b1632 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Fri, 16 Mar 2012 10:24:00 +0000 +Subject: [PATCH] Remove unnecessary rpaths from qml_device example + +These can't be valid in any case. + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + examples/declarative-systeminfo/device/device.pro | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +diff --git a/examples/declarative-systeminfo/device/device.pro b/examples/declarative-systeminfo/device/device.pro +index 698e5fb..05be9b7 100644 +--- a/examples/declarative-systeminfo/device/device.pro ++++ b/examples/declarative-systeminfo/device/device.pro +@@ -17,6 +17,3 @@ symbian { + } + RESOURCES += device.qrc + +-QMAKE_LFLAGS_DEBUG += "-Wl,-rpath,/home/user/qt/lib" +-QMAKE_LFLAGS_RPATH += "-Wl,-rpath,/home/user/qt/lib" +-QMAKE_LFLAGS_RELEASE += "-Wl,-rpath,/home/user/qt/lib" +-- +1.7.5.4 + 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 593cbd61a..1c4611db0 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 \ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \ file://qt-mobility-configure.patch \ - file://0001-gstvideoconnector-fixed-buffers-allocation.patch" + file://0001-gstvideoconnector-fixed-buffers-allocation.patch \ + file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch" SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44" -PR = "r2" +PR = "r3" S = "${WORKDIR}/qt-mobility-opensource-src-${PV}" |