diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-12-14 16:39:54 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-12-16 15:51:12 +0000 |
commit | 5ae76bbcf5b59b12a03d0f017aab9139609f16f6 (patch) | |
tree | 8fdd5068969a476fa482fe7d6f280e1d753918eb /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
parent | 06d1c47396508ea50112a00e1c70c40da559aa1a (diff) |
Upgrade to Qt 5.10.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 87bd5019..710d3a18 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -165,6 +165,10 @@ do_install() { # Install CMake's toolchain configuration mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ install -m 644 ${WORKDIR}/OEQt5Toolchain.cmake ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ + + # Fix up absolute paths in scripts + grep -lr /usr/bin/python ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/ | \ + xargs -r sed -i -e '1s,#!.*python,#! ${USRBINPATH}/env python,' } fakeroot do_generate_qt_environment_file() { @@ -197,4 +201,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1" +SRCREV = "50117d738af526cbfbd5afa50b9a501acb0fb9ce" |