diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-05-29 12:25:56 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-05-30 20:02:46 +0000 |
commit | e0a4e23c1dbeed88962694263de1776b530f3899 (patch) | |
tree | 50df74129e6ec5eb35f16213e62d0c0e1f3d137c /recipes-qt/qt5/qtbase_git.bb | |
parent | 73f99f2370a3dc5b81f42d0af7fe530431599454 (diff) | |
download | meta-qt5-e0a4e23c1dbeed88962694263de1776b530f3899.tar.gz |
qt5: Update to Qt 5.11.0
Add recipes for Qt OPC UA and Qt WebGL platform plugin.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index a599fc98..cc002b34 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -5,7 +5,6 @@ require qt5-ptest.inc | |||
5 | LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" | 5 | LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 7 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
8 | file://LICENSE.LGPLv3;md5=86d02ed8764e77c1c0b194fde895a51b \ | ||
9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 8 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 9 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 10 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
@@ -233,6 +232,10 @@ do_install_append() { | |||
233 | echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${TARGET_PREFIX}strip" >> $conf | 232 | echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${TARGET_PREFIX}strip" >> $conf |
234 | 233 | ||
235 | generate_target_qt_config_file ${D}${OE_QMAKE_PATH_BINS}/qt.conf | 234 | generate_target_qt_config_file ${D}${OE_QMAKE_PATH_BINS}/qt.conf |
235 | |||
236 | # Fix up absolute paths in scripts | ||
237 | sed -i -e '1s,#!/usr/bin/python,#! ${USRBINPATH}/env python,' \ | ||
238 | ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/uikit/devices.py | ||
236 | } | 239 | } |
237 | 240 | ||
238 | # mkspecs have mac specific scripts that depend on perl and bash | 241 | # mkspecs have mac specific scripts that depend on perl and bash |
@@ -240,4 +243,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
240 | 243 | ||
241 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 244 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
242 | 245 | ||
243 | SRCREV = "2b5587d901a0cc23749bf27a923d50bf0e5860d3" | 246 | SRCREV = "6eef81ee1c82f934e14d47047d8b6103b8755321" |