diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-03-24 15:30:09 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-03-29 21:59:38 +0300 |
| commit | 7d49e81ca5fcd639aea6f5e2e24677dbc90f4c17 (patch) | |
| tree | 99f2a52e1415e25def9e4958e5cc29a9abcbddd5 /recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | |
| parent | 2c08094d7553c087b8a16955a8da8a9f7b3cdc66 (diff) | |
| parent | ff073f04109900fc07bf81e2f1df63c626caf342 (diff) | |
| download | meta-qt5-7d49e81ca5fcd639aea6f5e2e24677dbc90f4c17.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9
* upstream/master:
nativesdk-qtbase: pass -no-icu for deterministic builds
qtwebengine: show progress for do_compile
packagegroup-qt5-toolchain-target: add qtquickcontrols2 package
qtwebengine: add commercial license
qtbase-native; do not build qdbuscpp2xml and qdbusxml2cpp bootstrapped
packagegroup-qt5-toolchain-target: Add QtSerialBus to meta-toolchain-qt5.
qtbase: PACKAGECONFIG[gtk] change gtk+ -> gtk+3 in dependencies
qtbase: remove absolute binary paths from mkspec files
qtbase-native: nativesdk-qtbase: remove patch that breaks mkspec setting for SDK
Change-Id: I99806099ccf7af78d61cba2df96b436cea76ddac
Diffstat (limited to 'recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb')
| -rwxr-xr-x | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 1521dbfa..234cde8c 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | |||
| @@ -83,6 +83,8 @@ RDEPENDS_${PN} += " \ | |||
| 83 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtsensors-qmlplugins', '', d)} \ | 83 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtsensors-qmlplugins', '', d)} \ |
| 84 | qtserialport-dev \ | 84 | qtserialport-dev \ |
| 85 | qtserialport-mkspecs \ | 85 | qtserialport-mkspecs \ |
| 86 | qtserialbus-dev \ | ||
| 87 | qtserialbus-mkspecs \ | ||
| 86 | qtsvg-dev \ | 88 | qtsvg-dev \ |
| 87 | qtsvg-mkspecs \ | 89 | qtsvg-mkspecs \ |
| 88 | qtsvg-plugins \ | 90 | qtsvg-plugins \ |
| @@ -106,6 +108,9 @@ RDEPENDS_${PN} += " \ | |||
| 106 | qtxmlpatterns-dev \ | 108 | qtxmlpatterns-dev \ |
| 107 | qtxmlpatterns-mkspecs \ | 109 | qtxmlpatterns-mkspecs \ |
| 108 | qttranslations-qtxmlpatterns \ | 110 | qttranslations-qtxmlpatterns \ |
| 111 | qtquickcontrols2 \ | ||
| 112 | qtquickcontrols2-dev \ | ||
| 113 | qtquickcontrols2-mkspecs \ | ||
| 109 | " | 114 | " |
| 110 | 115 | ||
| 111 | RRECOMMENDS_${PN} += " \ | 116 | RRECOMMENDS_${PN} += " \ |
