diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 12:35:37 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:22:18 +0000 |
commit | b716195f609de6547cfdfadfd4fd25292a6bbf09 (patch) | |
tree | 023714d64a2dfd392d0d9052761d657225a407df /recipes-python/pyqt5 | |
parent | 3224b028e70ab3a910ce4fccdd9f3fac4e37011f (diff) | |
download | meta-qt5-b716195f609de6547cfdfadfd4fd25292a6bbf09.tar.gz |
qmake5_paths: change the default QT_DIR_NAME to be empty
* there aren't many people using qt4 and qt5 in the same
image anymore, it's time to stop using this work around
and to follow default packaging rules
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-python/pyqt5')
-rw-r--r-- | recipes-python/pyqt5/python-pyqt5_5.10.1.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb index a9b52d9a..505db59d 100644 --- a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb +++ b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb | |||
@@ -48,7 +48,7 @@ do_configure_prepend() { | |||
48 | QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` | 48 | QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` |
49 | echo "[Qt $QT_VERSION]" >> pyqt.cfg | 49 | echo "[Qt $QT_VERSION]" >> pyqt.cfg |
50 | echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg | 50 | echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg |
51 | echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/qt5/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} | 51 | echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} |
52 | } | 52 | } |
53 | 53 | ||
54 | do_compile() { | 54 | do_compile() { |