[oe-commits] Tomas Novotny : qmake_base.bbclass: fix hardcoded paths in a generated qt.conf
git at git.openembedded.org
git at git.openembedded.org
Sat Feb 14 08:41:54 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: f4b8c0faa1cebda2a2742f8e4d622dcd024428e9
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f4b8c0faa1cebda2a2742f8e4d622dcd024428e9
Author: Tomas Novotny <tomas.novotny at tbs-biometrics.com>
Date: Mon Feb 9 15:14:45 2015 +0100
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 at tbs-biometrics.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
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 86bbede..dc98713 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
}
More information about the Openembedded-commits
mailing list