diff options
| author |   Tomas Novotny <tomas.novotny@tbs-biometrics.com> | 2015-02-09 15:14:45 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-14 08:40:33 +0000 |
| commit | f4b8c0faa1cebda2a2742f8e4d622dcd024428e9 (patch) | |
| tree | b07cc2f350100b59fd7fffa2706277e9248b3251 /meta | |
| parent | 6e390315b72a1c95d7f6e32a4b013f619f71e26b (diff) | |
| download | openembedded-core-f4b8c0faa1cebda2a2742f8e4d622dcd024428e9.tar.gz | |
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.
Signed-off-by: Tomas Novotny <tomas.novotny@tbs-biometrics.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/qmake_base.bbclass | 6 |
1 files 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 } |