[oe-commits] Andreas Oberritter : libconnman-qt: fix linking and packaging with Qt4/ Embedded

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 85cf133ac143af33b5227c4389ea3c253f4451e0
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=85cf133ac143af33b5227c4389ea3c253f4451e0

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Tue Jan 28 16:34:43 2014 +0100

libconnman-qt: fix linking and packaging with Qt4/Embedded

* Don't overwrite EXTRA_QMAKEVARS_PRE, because qt4e.bbclass uses
  it to pass on QT_LIBINFX.
* Generalize QT_IMPORTS_DIR to make it valid for qte.

Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
index e4f68db..77e70e8 100644
--- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
+++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
@@ -12,7 +12,7 @@ S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
-EXTRA_QMAKEVARS_PRE = "CONFIG+=notests"
+EXTRA_QMAKEVARS_PRE += "CONFIG+=notests"
 
 do_configure_prepend() {
     # Hack *.pro variables
@@ -48,6 +48,6 @@ FILES_${PN}-plugin-dbg = " \
     ${PLUGINS_TARGET}/.debug/* \
 "
 
-QT_IMPORTS_DIR = "${libdir}/qt4/imports"
+QT_IMPORTS_DIR = "${libdir}/${QT_DIR_NAME}/imports"
 # the plugin target needs to be the same as 'target.path' and 'qmldir.path' in ${S}/plugin/plugin.pro
 PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/Connman"