diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2016-10-08 16:11:02 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-11-01 19:07:47 +0100 |
| commit | df324ebd497db3ab935a79ddc5a378b14a6ea91f (patch) | |
| tree | 75cef82f0005246558133fd8d776521290cb75cc /recipes-qt/qt5/qtdeclarative_git.bb | |
| parent | 6255c3bc0ccf1b4329d9a460fa853be0d7827224 (diff) | |
qt5: Use existing variables for paths of host tools
Makes it possible to install qmake into ${bindir} without setting
QT_DIR_NAME = "".
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 5cc4caa1..2633be7e 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -22,7 +22,7 @@ SRC_URI += " \ file://0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch \ " -EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" +EXTRA_OEMAKE += "QMAKE_SYNCQT=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt" PACKAGECONFIG ??= "qtxmlpatterns" PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" @@ -33,7 +33,7 @@ do_configure_prepend() { sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro #set the path for syncqt properly - echo "QT_TOOL.syncqt.binary = \"${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt\"" > ${B}/.qmake.cache + echo "QT_TOOL.syncqt.binary = \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt\"" > ${B}/.qmake.cache } EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |