aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2022-03-21 10:06:34 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-23 13:00:00 +0000
commit466377bff2b0fcbc76e99f981379ddf2462fea0c (patch)
tree98894f46a3ad8268aeed7f29943cebefcbf1e43e
parent67ba904ac5966c3ca333dfc76e52005e0606609b (diff)
qtinterfaceframework: remove workaround
Kirkstone has been updated with working nativesdk-python3 builds and qtinterfacewramework can now be included in the SDK. Change-Id: Ibcaf520688a56f9607db89993aa9ec9e2d667844 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit bc0717a20b77bd0a0f9b3be6c0cfa3407208611f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb7
1 files changed, 0 insertions, 7 deletions
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb
index 9899da5..3b31381 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb
@@ -43,10 +43,3 @@ RDEPENDS:${PN}:remove:mingw32 = " \
nativesdk-perl-modules \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools', '', d)} \
"
-
-python () {
- # qtinterfaceframework has dependencies that fail to build for nativesdk with meta-openembedded/master
- if d.getVar('DISTRO_CODENAME', True) in ['master', 'kirkstone']:
- PN = d.getVar('PN', True)
- d.setVar('RDEPENDS:' + PN, d.getVar('RDEPENDS:' + PN).replace('nativesdk-qtinterfaceframework-dev', '').replace('nativesdk-qtinterfaceframework-tools', ''))
-}