Add qtdeclarative-native dependency automatically

This commit is contained in:
Samuli Piippo 2020-02-13 12:19:50 +02:00
parent 250391d3a4
commit 8d1532aac7
7 changed files with 16 additions and 5 deletions

View File

@ -15,6 +15,12 @@ python __anonymous() {
d.setVar("PACKAGE_ARCH", tarch)
}
# Automotically add qtdeclarative-native when recipe depends on qtdeclarative
python __anonymous() {
if bb.utils.contains('DEPENDS', "qtdeclarative", True, False, d):
d.appendVar("DEPENDS", " qtdeclarative-native")
}
# Many examples come with libraries installed outside of standard libdir,
# suppress QA check complaining
INSANE_SKIP_${PN}-dbg += "libdir"

View File

@ -25,3 +25,8 @@ DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "3e0edc61cf4d2e0a613ed971f42a96120b094ecc"
do_install_append_class-target() {
# broken installation of plugins.qmltypes
rm -rf ${D}/usr/qml_install_dir-NOTFOUND
}

View File

@ -9,7 +9,7 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtquickcontrols2"
DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
#PACKAGECONFIG ??= "sdl2"
PACKAGECONFIG[sdl2] = "-DFEATURE_sdl2=ON,-DFEATURE_sdl2=OFF,libsdl2"

View File

@ -15,6 +15,6 @@ REQUIRED_DISTRO_FEATURES = "opengl"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
DEPENDS += "qtbase qtdeclarative"
SRCREV = "936be561e4b2d28b51a1c1a9dae4b7baf1f932e1"

View File

@ -12,6 +12,6 @@ include recipes-qt/qt6/qt6.inc
PACKAGECONFIG ?= "translations"
DEPENDS = "qtbase qtdeclarative qtdeclarative-native"
DEPENDS = "qtbase qtdeclarative"
SRCREV = "2bd4f5cd587e258227c69b3124757d7b8e019c9f"

View File

@ -12,7 +12,7 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qttools-native"
DEPENDS += "qtbase qtdeclarative qttools-native"
SRC_URI += "\
file://0001-Add-more-tools-as-part-of-Qt6-LinguistTools.patch \

View File

@ -12,6 +12,6 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtwebsockets"
DEPENDS += "qtbase qtdeclarative qtwebsockets"
SRCREV = "3c3d168487b10e7e4d7c06df5a28df9d4220b6de"