t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-06-21 08:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

qmake5_paths: change the default QT_DIR_NAME to be empty

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/qmake5_paths.bbclass
View File

@@ -2,7 +2,7 @@
# about conflicts with qt4, then you can add qmake5_paths.bbclass
# to your distro layer and flatten all QT_DIR_NAME directories
QT_DIR_NAME ?= "/qt5"
QT_DIR_NAME ?= ""
# This is useful for target recipes to reference native mkspecs
QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}${QT_DIR_NAME}"

6
recipes-connectivity/libqofono/libqofono_git.bb
View File

@@ -26,10 +26,10 @@ FILES_${PN}-tests = " \
/opt/tests/libqofono-qt5 \
"
FILES_${PN} += " \
${libdir}/qt5/qml/MeeGo/QOfono/qmldir \
${libdir}/qt5/qml/MeeGo/QOfono/libQOfonoQtDeclarative.so \
${OE_QMAKE_PATH_QML}/MeeGo/QOfono/qmldir \
${OE_QMAKE_PATH_QML}/MeeGo/QOfono/libQOfonoQtDeclarative.so \
"
FILES_${PN}-dev += " \
${datadir}/qt5/mkspecs \
${OE_QMAKE_PATH_ARCHDATA}/mkspecs \
${libdir}/libqofono-qt5.prl \
"

2
recipes-python/pyqt5/python-pyqt5_5.10.1.bb
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() {