[oe] [meta-oe][PATCH v2] qwt-e: qwt 6.1.0 FTBFS fix for qt-embedded targets

[Björn Krombholz]

QWT 6.1.0 changed the handling of the QT_INFIX variable.
Builds with any QT_INFIX defined will fail as the generated qmake TARGET
is always libqwt.* ignoring the INFIX. Sub-projects like designer respect
the INFIX variable however and won't find the libqwtE*.so.

Signed-off-by: Björn Krombholz <b.krombholz at pironex.de>
---
For yocto-1.4 branch, no QWT 6.1.0 in 1.5+ yet.

v2: removed PR/INC_PR, moved the SRC_URI modification to the .bb file 
as it is only useful for qwt-e and the particular version 6.1.0.

 meta-oe/recipes-qt/qwt/files/qwt-e_qt_infix.patch | 13 +++++++++++++
 meta-oe/recipes-qt/qwt/qwt-e_6.1.0.bb             |  3 +++
 2 files changed, 16 insertions(+)
 create mode 100644 meta-oe/recipes-qt/qwt/files/qwt-e_qt_infix.patch

diff --git a/meta-oe/recipes-qt/qwt/files/qwt-e_qt_infix.patch b/meta-oe/recipes-qt/qwt/files/qwt-e_qt_infix.patch
new file mode 100644
index 0000000..3a6fb64
--- /dev/null
+++ b/meta-oe/recipes-qt/qwt/files/qwt-e_qt_infix.patch
@@ -0,0 +1,13 @@
+Index: qwt-6.1.0/qwtfunctions.pri
+===================================================================
+--- qwt-6.1.0.orig/qwtfunctions.pri	2014-04-11 16:25:59.291152505 +0200
++++ qwt-6.1.0/qwtfunctions.pri	2014-04-11 16:26:25.749892402 +0200
+@@ -12,7 +12,7 @@
+ defineReplace(qwtLibraryTarget) {
+ 
+     unset(LIBRARY_NAME)
+-    LIBRARY_NAME = $$1
++    LIBRARY_NAME = $$1$${QT_LIBINFIX}
+ 
+     mac:contains(QWT_CONFIG, QwtFramework) {
+ 
diff --git a/meta-oe/recipes-qt/qwt/qwt-e_6.1.0.bb b/meta-oe/recipes-qt/qwt/qwt-e_6.1.0.bb
index 7694514..4d23bc0 100644
--- a/meta-oe/recipes-qt/qwt/qwt-e_6.1.0.bb
+++ b/meta-oe/recipes-qt/qwt/qwt-e_6.1.0.bb
@@ -2,6 +2,9 @@ inherit qt4e
 
 require qwt.inc
 
+SRC_URI += "file://qwt-e_qt_infix.patch \
+"
+
 SRC_URI[qwt.md5sum] = "aef0437b37f191067a6a9dc01c30ba64"
 SRC_URI[qwt.sha256sum] = "a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402"
 
-- 
1.9.2