diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-08-30 09:10:16 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-09-04 12:32:34 +0000 |
| commit | 9371bfaf4c72f429eb2ab28316ef9a9be2b00c65 (patch) | |
| tree | 8d923e44431857333828f94def06f1897d338b53 | |
| parent | 0a606b46deaa7938308eebf068dc204c33984332 (diff) | |
| download | meta-boot2qt-9371bfaf4c72f429eb2ab28316ef9a9be2b00c65.tar.gz | |
qtwebview: include qtwebview into image and toolchain
Task-number: QTBUG-61124
Change-Id: Ibf8920c2bd42bbff192923f8f7c8b95e5216ead5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 211ba0a..7a22951 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | |||
| @@ -70,7 +70,7 @@ RDEPENDS_${PN} += " \ | |||
| 70 | qttools-staticdev \ | 70 | qttools-staticdev \ |
| 71 | qtvirtualkeyboard-dev \ | 71 | qtvirtualkeyboard-dev \ |
| 72 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ | 72 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ |
| 73 | ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ | 73 | ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev qtwebview-dev', '', d)} \ |
| 74 | qtwebsockets-dev \ | 74 | qtwebsockets-dev \ |
| 75 | qtwebchannel-dev \ | 75 | qtwebchannel-dev \ |
| 76 | qtxmlpatterns-dev \ | 76 | qtxmlpatterns-dev \ |
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 081d8fe..8ad37d8 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | |||
| @@ -70,7 +70,7 @@ RDEPENDS_${PN} += " \ | |||
| 70 | qttranslations-qtwebsockets \ | 70 | qttranslations-qtwebsockets \ |
| 71 | qttranslations-qtxmlpatterns \ | 71 | qttranslations-qtxmlpatterns \ |
| 72 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ | 72 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ |
| 73 | ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine', '', d)} \ | 73 | ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine qtwebview', '', d)} \ |
| 74 | qtwebsockets \ | 74 | qtwebsockets \ |
| 75 | qtwebchannel \ | 75 | qtwebchannel \ |
| 76 | qtxmlpatterns \ | 76 | qtxmlpatterns \ |