[oe] [meta-oe][PATCH] libconnman-qt: fix linking and packaging with Qt4/Embedded

[Andreas Oberritter]

* 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>
---
 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"
-- 
1.8.3.2