aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-01-19 10:26:06 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2017-02-13 10:26:36 +0000
commit0cc8a8a21e1ba7ffa237c64608b2a6678897c096 (patch)
tree8338b413ab3c8eb08b176183651c669e56f7d66a /classes
parent02dca2673dba478ee11bfbab62888d2cdbe961e4 (diff)
qt5: Upgrade to Qt 5.9.0
Change-Id: I446186476047563fd5377662d1827c45c2394140 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'classes')
-rw-r--r--classes/qmake5_base.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 50e5a306..a3d5cd03 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -214,6 +214,8 @@ qmake5_base_do_install() {
qmake5_base_fix_install ${STAGING_DIR_NATIVE}
if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then
- sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc
+ sed -i ${D}${libdir}/pkgconfig/*.pc \
+ -e "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" \
+ -e "s@${STAGING_DIR_TARGET}@@g"
fi
}