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>
This commit is contained in:
Martin Jansa
2018-09-14 12:35:37 +00:00
parent 3224b028e7
commit b716195f60
3 changed files with 5 additions and 5 deletions

View File

@@ -48,7 +48,7 @@ do_configure_prepend() {
QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION`
echo "[Qt $QT_VERSION]" >> pyqt.cfg
echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/qt5/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST}
echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST}
}
do_compile() {