From b514c5d67a259457383db532151a4bf6f482d158 Mon Sep 17 00:00:00 2001
From: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Date: Wed, 5 Dec 2012 13:50:46 -0800
Subject: Updated QT_CONF_PATH default values in qmake5_base

This allows the subsequent modules to install correctly. Also during
do_configure we stage target specific file into the staging area and
modify some prf files inorder to make the module (qt_lib_<module>.pri)
files install correctly

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
---
 classes/qmake5_base.bbclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'classes')

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 7012d0d7..014d4618 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -17,13 +17,13 @@ do_generate_qt_config_file() {
 	export QT_CONF_PATH=${WORKDIR}/qt.conf
 	cat > ${WORKDIR}/qt.conf <<EOF
 [Paths]
-Prefix =
-Binaries = ${STAGING_BINDIR_NATIVE}
-Headers = ${STAGING_INCDIR}/qt5
-Plugins = ${STAGING_LIBDIR}/qt5/plugins/
-Libraries = ${STAGING_LIBDIR}
+Binaries = ${bindir}
+Headers = ${includedir}/qt5
+Plugins = ${libdir}/qt5/plugins
+Libraries = ${libdir}
+Data = ${datadir}/qt5
 HostData = ${STAGING_DATADIR}/qt5
-HostBinaries = ${STAGING_BINDIR_NATIVE}/
+HostBinaries = ${STAGING_BINDIR_NATIVE}
 EOF
 }
 
-- 
cgit v1.2.3-54-g00ecf