diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-11-26 21:34:49 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-11-28 04:55:09 +0100 |
commit | 456ec4ac9560ba184e1a20ee491b0365713edadb (patch) | |
tree | f4d670f16ef447189adfccc81634499e0ac21c60 | |
parent | f264e5dd1b589a1cf2d3904bd8c88605de43c5f6 (diff) | |
download | meta-qt5-456ec4ac9560ba184e1a20ee491b0365713edadb.tar.gz |
qt5-creator, qtbase: Replace python with python3
Ensure py3 is used during build
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qt5-creator_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index a3960042..a2717ee6 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb | |||
@@ -66,7 +66,7 @@ FILES_${PN}-dev += " \ | |||
66 | ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ | 66 | ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ |
67 | " | 67 | " |
68 | 68 | ||
69 | RDEPENDS_${PN} += "perl python" | 69 | RDEPENDS_${PN} += "perl python3" |
70 | RCONFLICTS_${PN} = "qt-creator" | 70 | RCONFLICTS_${PN} = "qt-creator" |
71 | 71 | ||
72 | # To give best user experience out of the box.. | 72 | # To give best user experience out of the box.. |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1b9bb0a9..f4f0919c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -268,8 +268,8 @@ do_install_append() { | |||
268 | 268 | ||
269 | generate_target_qt_config_file ${D}${OE_QMAKE_PATH_BINS}/qt.conf | 269 | generate_target_qt_config_file ${D}${OE_QMAKE_PATH_BINS}/qt.conf |
270 | 270 | ||
271 | # Fix up absolute paths in scripts | 271 | # Fix up absolute paths in scripts and use python3 instead of python |
272 | sed -i -e '1s,#!/usr/bin/python,#! ${USRBINPATH}/env python,' \ | 272 | sed -i -e '1s,#!/usr/bin/python$,#! ${USRBINPATH}/env python3,' \ |
273 | ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/uikit/devices.py | 273 | ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/uikit/devices.py |
274 | } | 274 | } |
275 | 275 | ||