summaryrefslogtreecommitdiffstats
path: root/meta/classes/qmake_base.bbclass
diff options
context:
space:
mode:
authorTomas Novotny <tomas.novotny@tbs-biometrics.com>2015-02-09 15:14:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-14 08:40:57 +0000
commita298d8cf5ad1d544d81f22d0ca69551b1a5360ea (patch)
treee7d4b83252ecc3a1cd676e667773449d29b0c706 /meta/classes/qmake_base.bbclass
parent23bf6bf78b6f27e321b48c4c8a92e8092d05ea3c (diff)
downloadpoky-a298d8cf5ad1d544d81f22d0ca69551b1a5360ea.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. (From OE-Core rev: f4b8c0faa1cebda2a2742f8e4d622dcd024428e9) Signed-off-by: Tomas Novotny <tomas.novotny@tbs-biometrics.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/qmake_base.bbclass')
-rw-r--r--meta/classes/qmake_base.bbclass6
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() {
38[Paths] 38[Paths]
39Prefix = 39Prefix =
40Binaries = ${STAGING_BINDIR_NATIVE} 40Binaries = ${STAGING_BINDIR_NATIVE}
41Headers = ${STAGING_INCDIR}/qt4 41Headers = ${STAGING_INCDIR}/${QT_DIR_NAME}
42Plugins = ${STAGING_LIBDIR}/qt4/plugins/ 42Plugins = ${STAGING_LIBDIR}/${QT_DIR_NAME}/plugins/
43Mkspecs = ${STAGING_DATADIR}/qt4/mkspecs/ 43Mkspecs = ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/
44EOF 44EOF
45} 45}
46 46