diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-01 16:46:14 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-09 12:22:36 +0000 |
commit | c4a0a450b4275cc3869cf389c92e86b62f09fcea (patch) | |
tree | 6705cbb48ae3d433639bad3e78e239d210e13dee /recipes-qt/qt5/qtenginio_git.bb | |
parent | 4e113c7b8e0a7512d2f0ad306decc8b4885ef807 (diff) | |
download | meta-qt5-c4a0a450b4275cc3869cf389c92e86b62f09fcea.tar.gz |
qt5: update submodules
New configuration system is now used for more modules, so add new
EXTRA_QMAKEVARS_CONFIGURE variable that can be used for configure
modules with -[no-]feature flags.
SHA1s are now from the release 5.8.0 branches, so need to add "nobranch=1"
option so that there is no build break when release branches are removed.
Add recipe for QtGamepad module, it's already used by Qt3D.
Change-Id: I152b3b66b68c802d07445f4a7f1e81802308418e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtenginio_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtenginio_git.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index c2455bf1..2f32a884 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb | |||
@@ -3,9 +3,9 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | 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 )" | 4 | 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 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
7 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ | 10 | file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ |
11 | " | 11 | " |
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ | |||
13 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" | 13 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" |
14 | 14 | ||
15 | QT_MODULE_BRANCH = "dev" | 15 | QT_MODULE_BRANCH = "dev" |
16 | SRCREV = "b0ad5907f480307853f7ac951bacfaa61dcbd94e" | 16 | SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" |
17 | 17 | ||
18 | do_install_append() { | 18 | do_install_append() { |
19 | if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then | 19 | if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then |