summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-05-08 22:13:07 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-09 13:55:04 +0200
commit1965248b7ba440e27c5c8e30f35ce8cf4afc7987 (patch)
tree1f9182440320db4d6d07febef20c8160e222a443
parent9773d8eb228275751bb2585d823e8df956356b14 (diff)
downloadmeta-qt5-1965248b7ba440e27c5c8e30f35ce8cf4afc7987.tar.gz
qmake5: use QT_CONF_PATH variable in do_generate_qt_config_file
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--classes/qmake5_base.bbclass2
-rw-r--r--recipes-qt/qt5/qtbase.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index dbba0bc9..34757c5a 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -74,7 +74,7 @@ OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}"
74STRIP[unexport] = "1" 74STRIP[unexport] = "1"
75 75
76do_generate_qt_config_file() { 76do_generate_qt_config_file() {
77 cat > ${WORKDIR}/qt.conf <<EOF 77 cat > ${QT_CONF_PATH} <<EOF
78[Paths] 78[Paths]
79Prefix = ${OE_QMAKE_PATH_PREFIX} 79Prefix = ${OE_QMAKE_PATH_PREFIX}
80Headers = ${OE_QMAKE_PATH_HEADERS} 80Headers = ${OE_QMAKE_PATH_HEADERS}
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 2af91796..a89bbc16 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -75,7 +75,7 @@ INC_PR = "r0"
75ARM_INSTRUCTION_SET = "arm" 75ARM_INSTRUCTION_SET = "arm"
76 76
77do_generate_qt_config_file_append() { 77do_generate_qt_config_file_append() {
78 cat >> ${WORKDIR}/qt.conf <<EOF 78 cat >> ${QT_CONF_PATH} <<EOF
79 79
80[EffectivePaths] 80[EffectivePaths]
81Prefix=.. 81Prefix=..