| Submitter | Otavio Salvador |
|---|---|
| Date | May 10, 2011, 2:51 p.m. |
| Message ID | <1305039119-1469-2-git-send-email-otavio@ossystems.com.br> |
| Download | mbox | patch |
| Permalink | /patch/3661/ |
| State | New, archived |
| Headers | show |
Comments
On Tue, 2011-05-10 at 14:51 +0000, Otavio Salvador wrote: > This writes a qt.conf inside WORKDIR to properly configure projects > based on CMake. This is required since qmake variables (returned > by -query command) are fixed into the binary and can only be > changed using a qt.conf file. > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > meta/classes/qmake_base.bbclass | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) I've merged this to master, thanks. Richard
Patch
diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass index 24a0f11..a054efd 100644 --- a/meta/classes/qmake_base.bbclass +++ b/meta/classes/qmake_base.bbclass @@ -31,6 +31,20 @@ oe_qmake_mkspecs () { done } +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}/qt4 +Plugins = ${STAGING_LIBDIR}/qt4/plugins/ +Mkspecs = ${STAGING_DATADIR}/qt4/mkspecs/ +EOF +} + +addtask generate_qt_config_file after do_patch before do_configure + qmake_base_do_configure() { case ${QMAKESPEC} in *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++)
This writes a qt.conf inside WORKDIR to properly configure projects based on CMake. This is required since qmake variables (returned by -query command) are fixed into the binary and can only be changed using a qt.conf file. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- meta/classes/qmake_base.bbclass | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)