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) | |
download | meta-qt5-b514c5d67a259457383db532151a4bf6f482d158.tar.gz |
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() { | |||
17 | export QT_CONF_PATH=${WORKDIR}/qt.conf | 17 | export QT_CONF_PATH=${WORKDIR}/qt.conf |
18 | cat > ${WORKDIR}/qt.conf <<EOF | 18 | cat > ${WORKDIR}/qt.conf <<EOF |
19 | [Paths] | 19 | [Paths] |
20 | Prefix = | 20 | Binaries = ${bindir} |
21 | Binaries = ${STAGING_BINDIR_NATIVE} | 21 | Headers = ${includedir}/qt5 |
22 | Headers = ${STAGING_INCDIR}/qt5 | 22 | Plugins = ${libdir}/qt5/plugins |
23 | Plugins = ${STAGING_LIBDIR}/qt5/plugins/ | 23 | Libraries = ${libdir} |
24 | Libraries = ${STAGING_LIBDIR} | 24 | Data = ${datadir}/qt5 |
25 | HostData = ${STAGING_DATADIR}/qt5 | 25 | HostData = ${STAGING_DATADIR}/qt5 |
26 | HostBinaries = ${STAGING_BINDIR_NATIVE}/ | 26 | HostBinaries = ${STAGING_BINDIR_NATIVE} |
27 | EOF | 27 | EOF |
28 | } | 28 | } |
29 | 29 | ||