diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-20 14:22:57 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-27 12:46:53 +0000 |
| commit | f3f7d8ef1ee02d3a2e691657a0ac26cb0261eda6 (patch) | |
| tree | cf92f4b22809a47415e30a9d405d232cd7214ddc /recipes-qt/packagegroups | |
| parent | 429a8e9a0b720b2ca1e66fff921888bbdef3e378 (diff) | |
| download | meta-qt5-f3f7d8ef1ee02d3a2e691657a0ac26cb0261eda6.tar.gz | |
qt5: update submodules
Add more PACKAGECONFIGs for qtbase. Merge the two qtwayland recipes to
one that supports all three targets (target, native, nativesdk).
Previous workaround removed and new ones added for: QTBUG-56656, QTBUG-56666
Reduce number of patches applied to qtbase.
Change-Id: I6b82fd46aaade4f14cf61e29adb7fc984070333b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/packagegroups')
| -rwxr-xr-x | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 25bc5304..1521dbfa 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | |||
| @@ -53,7 +53,6 @@ RDEPENDS_${PN} += " \ | |||
| 53 | qttranslations-qtconnectivity \ | 53 | qttranslations-qtconnectivity \ |
| 54 | qtdeclarative-dev \ | 54 | qtdeclarative-dev \ |
| 55 | qtdeclarative-mkspecs \ | 55 | qtdeclarative-mkspecs \ |
| 56 | qtdeclarative-plugins \ | ||
| 57 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \ | 56 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \ |
| 58 | qtdeclarative-tools \ | 57 | qtdeclarative-tools \ |
| 59 | qtdeclarative-staticdev \ | 58 | qtdeclarative-staticdev \ |