summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorMikko Levonmaa <mikko.levonmaa@gmail.com>2012-12-09 13:48:29 -0800
committerMikko Levonmaa <mikko.levonmaa@gmail.com>2012-12-09 13:50:26 -0800
commitbd6c9c28c2aa789a7f906a7ffb5bc2c18cc77884 (patch)
treea7cd2f5e827755acf96d5e21d8988ade235b807b /classes
parent5dc4d0616a4dd00dfaaafe37317cb606a3e3863d (diff)
downloadmeta-qt5-bd6c9c28c2aa789a7f906a7ffb5bc2c18cc77884.tar.gz
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>
Diffstat (limited to 'classes')
-rw-r--r--classes/qmake5_base.bbclass15
1 files changed, 8 insertions, 7 deletions
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,"
14STRIP[unexport] = "1" 14STRIP[unexport] = "1"
15 15
16do_generate_qt_config_file() { 16do_generate_qt_config_file() {
17 export QT_CONF_PATH=${WORKDIR}/qt.conf 17
18 cat > ${WORKDIR}/qt.conf <<EOF 18 export QT_CONF_PATH=${WORKDIR}/qt.conf
19 cat > ${WORKDIR}/qt.conf <<EOF
19[Paths] 20[Paths]
20Binaries = ${bindir} 21Binaries = ${bindir}
21Headers = ${includedir}/qt5 22Headers = ${STAGING_INCDIR}/qt5
22Plugins = ${libdir}/qt5/plugins 23Plugins = ${libdir}/qt5/plugins
23Libraries = ${libdir} 24Libraries = ${libdir}
25Imports = ${datadir}/qt5/imports
26Qml2Imports = ${libdir}/qt5/qml
27Documentation=${docdir}/qt5
24Data = ${datadir}/qt5 28Data = ${datadir}/qt5
25HostData = ${STAGING_DATADIR}/qt5 29HostData = ${STAGING_DATADIR}/qt5
26HostBinaries = ${STAGING_BINDIR_NATIVE} 30HostBinaries = ${STAGING_BINDIR_NATIVE}
27EOF 31EOF
32
28} 33}
29 34
30addtask generate_qt_config_file after do_patch before do_configure 35addtask generate_qt_config_file after do_patch before do_configure
31
32#EXPORT_FUNCTIONS do_configure
33
34#addtask configure after do_unpack do_patch before do_compile