From a298d8cf5ad1d544d81f22d0ca69551b1a5360ea Mon Sep 17 00:00:00 2001 From: Tomas Novotny Date: Mon, 9 Feb 2015 15:14:45 +0100 Subject: qmake_base.bbclass: fix hardcoded paths in a generated qt.conf The qmake_base class generates internal qt.conf for build with hardcoded qt4 target paths. This is ok for qt4-x11 as this is the default $QT_DIR_NAME, but it is wrong for qt4-embedded, because qtopia is its default directory. (From OE-Core rev: f4b8c0faa1cebda2a2742f8e4d622dcd024428e9) Signed-off-by: Tomas Novotny Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/qmake_base.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass index 86bbede260..dc98713fd2 100644 --- a/meta/classes/qmake_base.bbclass +++ b/meta/classes/qmake_base.bbclass @@ -38,9 +38,9 @@ do_generate_qt_config_file() { [Paths] Prefix = Binaries = ${STAGING_BINDIR_NATIVE} -Headers = ${STAGING_INCDIR}/qt4 -Plugins = ${STAGING_LIBDIR}/qt4/plugins/ -Mkspecs = ${STAGING_DATADIR}/qt4/mkspecs/ +Headers = ${STAGING_INCDIR}/${QT_DIR_NAME} +Plugins = ${STAGING_LIBDIR}/${QT_DIR_NAME}/plugins/ +Mkspecs = ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/ EOF } -- cgit v1.2.3-54-g00ecf