diff options
| author | Mikko Levonmaa <mikko.levonmaa@gmail.com> | 2012-12-09 13:48:29 -0800 |
|---|---|---|
| committer | Mikko Levonmaa <mikko.levonmaa@gmail.com> | 2012-12-09 13:50:26 -0800 |
| commit | bd6c9c28c2aa789a7f906a7ffb5bc2c18cc77884 (patch) | |
| tree | a7cd2f5e827755acf96d5e21d8988ade235b807b /classes | |
| parent | 5dc4d0616a4dd00dfaaafe37317cb606a3e3863d (diff) | |
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.bbclass | 15 |
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," 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 |