diff options
| author | Mikko Levonmaa <mikko.levonmaa@gmail.com> | 2012-12-05 13:50:46 -0800 |
|---|---|---|
| committer | Mikko Levonmaa <mikko.levonmaa@gmail.com> | 2012-12-07 08:48:15 -0800 |
| commit | b514c5d67a259457383db532151a4bf6f482d158 (patch) | |
| tree | 4f20cd92c147a57f9de4f0e19a8b502a83736baf /classes | |
| parent | 17d2bf1cdd6a6b23a88a8e07dcb640e8f01115d2 (diff) | |
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>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake5_base.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
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 } |