From 5e178993e6f1dbdbba87f131f7df871742d6e1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 7 Oct 2015 20:39:09 +0200
Subject: [PATCH] kde-base.bbclass / phonon: follow meta-qt5's change for
 QT_DIR_NAME
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 classes/kde-base.bbclass                 | 4 ++--
 recipes-kde/other/phonon/phonon_4.8.3.bb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/kde-base.bbclass b/classes/kde-base.bbclass
index e9f1115c..b7bfd51c 100644
--- a/classes/kde-base.bbclass
+++ b/classes/kde-base.bbclass
@@ -13,10 +13,10 @@ FILES_${PN}-dev += "${libdir}/cmake"
 FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug"
 
 EXTRA_OECMAKE += " \
-    -DECM_MKSPECS_INSTALL_DIR=${libdir}/${QT_DIR_NAME}/mkspecs/modules \
+    -DECM_MKSPECS_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/modules \
     -DCMAKE_INSTALL_DATADIR=share \
     -DCMAKE_INSTALL_DBUSINTERFACEDIR=share/dbus-1/interfaces \
     -DKDE_INSTALL_QTPLUGINDIR=${OE_QMAKE_PATH_PLUGINS} \
     -DKDE_INSTALL_QMLDIR=${OE_QMAKE_PATH_QML} \
 "
-FILES_${PN}-dev += "${libdir}/${QT_DIR_NAME}/mkspecs"
+FILES_${PN}-dev += "${libdir}${QT_DIR_NAME}/mkspecs"
diff --git a/recipes-kde/other/phonon/phonon_4.8.3.bb b/recipes-kde/other/phonon/phonon_4.8.3.bb
index fba5489e..2088f4dc 100644
--- a/recipes-kde/other/phonon/phonon_4.8.3.bb
+++ b/recipes-kde/other/phonon/phonon_4.8.3.bb
@@ -35,4 +35,4 @@ FILES_${PN}-designer-plugin = "${OE_QMAKE_PATH_PLUGINS}/designer"
 FILES_${PN}-designer-plugin-dbg = "${OE_QMAKE_PATH_PLUGINS}/designer/.debug"
 
 FILES_${PN} += "${datadir}/dbus-1"
-FILES_${PN}-dev += "${datadir}/${QT_DIR_NAME}/mkspecs ${datadir}/phonon4qt5/buildsystem"
+FILES_${PN}-dev += "${datadir}${QT_DIR_NAME}/mkspecs ${datadir}/phonon4qt5/buildsystem"