From bd6c9c28c2aa789a7f906a7ffb5bc2c18cc77884 Mon Sep 17 00:00:00 2001
From: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Date: Sun, 9 Dec 2012 13:48:29 -0800
Subject: qtbase: fix installations

Created new variables OE_CROSS_INSTALL_DATA and OE_CROSS_HOST_DATA
to support the installation and configuration of qtbase and dependant
modules.

Added paths for Qml2Imports

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

(limited to 'classes/qmake5_base.bbclass')

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 014d4618..09cb3ea5 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -14,21 +14,22 @@ export OE_QMAKE_RPATH="-Wl,-rpath-link,"
 STRIP[unexport] = "1"
 
 do_generate_qt_config_file() {
-	export QT_CONF_PATH=${WORKDIR}/qt.conf
-	cat > ${WORKDIR}/qt.conf <<EOF
+
+    export QT_CONF_PATH=${WORKDIR}/qt.conf
+    cat > ${WORKDIR}/qt.conf <<EOF
 [Paths]
 Binaries = ${bindir}
-Headers = ${includedir}/qt5
+Headers = ${STAGING_INCDIR}/qt5
 Plugins = ${libdir}/qt5/plugins
 Libraries = ${libdir}
+Imports = ${datadir}/qt5/imports
+Qml2Imports = ${libdir}/qt5/qml
+Documentation=${docdir}/qt5
 Data = ${datadir}/qt5
 HostData = ${STAGING_DATADIR}/qt5
 HostBinaries = ${STAGING_BINDIR_NATIVE}
 EOF
+
 }
 
 addtask generate_qt_config_file after do_patch before do_configure
-
-#EXPORT_FUNCTIONS do_configure
-
-#addtask configure after do_unpack do_patch before do_compile
-- 
cgit v1.2.3