CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add qtdeclarative-native dependency where needed

Browse Source 
In Qt5, dependency to qtdeclarative-native was added dynamically for
every recipe that had dependency to qtdeclarative. This was done because
building static Qt required the native package even when dynamic build
did not. Remove this automatic dependency and explicitly add the dependency
to those recipe that require it.

Change-Id: Ida44d6a05d95db500b7fbfcb803c703c0433e93b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit c3389d194c)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2021-10-11 11:00:01 +03:00
parent f96a7db1d4
commit 071f45d2dd
18 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-qt/qt6/qt3d_git.bb
View File

@ -20,7 +20,7 @@ SRC_URI += " \
${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
"
DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native"
DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtshadertools qtshadertools-native"
PACKAGECONFIG[system-assimp] = "-DFEATURE_qt3d_system_assimp=ON,-DQT_FEATURE_qt3d_system_assimp=OFF,assimp"
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"

2
recipes-qt/qt6/qt5compat_git.bb
View File

@ -17,7 +17,7 @@ DEPENDS += "qtbase"
PACKAGECONFIG ?= "qml"
PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"
PACKAGECONFIG[qml] = ",,qtdeclarative"
PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
BBCLASSEXTEND = "native nativesdk"

6
recipes-qt/qt6/qt6.inc
View File

@ -21,12 +21,6 @@ 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"

2
recipes-qt/qt6/qtcharts_git.bb
View File

@ -11,5 +11,5 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
PACKAGECONFIG ?= "qml"
PACKAGECONFIG[qml] = ",,qtdeclarative"
PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"

2
recipes-qt/qt6/qtcoap_git.bb
View File

@ -10,5 +10,5 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"

2
recipes-qt/qt6/qtconnectivity_git.bb
View File

@ -15,7 +15,7 @@ include recipes-qt/qt6/qt6.inc
# QTBUG-93565
PTEST_ENABLED = "0"
DEPENDS += "qtbase qtdeclarative"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"

2
recipes-qt/qt6/qtdatavis3d_git.bb
View File

@ -8,5 +8,5 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

2
recipes-qt/qt6/qtlottie_git.bb
View File

@ -9,5 +9,5 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

2
recipes-qt/qt6/qtmqtt_git.bb
View File

@ -11,5 +11,5 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native qtwebsockets"

2
recipes-qt/qt6/qtmultimedia_git.bb
View File

@ -18,7 +18,7 @@ PACKAGECONFIG ?= "gstreamer qml"
PACKAGECONFIG[alsa] = "-DFEATURE_alsa=ON,-DFEATURE_alsa=OFF,alsa-lib"
PACKAGECONFIG[pulseaudio] = "-DFEATURE_pulseaudio=ON,-DFEATURE_pulseaudio=OFF,pulseaudio"
PACKAGECONFIG[gstreamer] = "-DFEATURE_gstreamer=ON,-DFEATURE_gstreamer=OFF,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
PACKAGECONFIG[qml] = ",,qtdeclarative"
PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
EXTRA_OECMAKE += "-DFEATURE_gpu_vivante=OFF"

2
recipes-qt/qt6/qtopcua_git.bb
View File

@ -11,7 +11,7 @@ include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
PACKAGECONFIG ?= "qml"
PACKAGECONFIG[qml] = ",,qtdeclarative"
PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
# src/3rdparty/open62541.pri adds -Wno-format, causing following error
# because -Wformat-security cannot be used together with -Wno-format

2
recipes-qt/qt6/qtpositioning_git.bb
View File

@ -20,5 +20,5 @@ PACKAGECONFIG ?= "nmea qml"
PACKAGECONFIG[geoclue] = ",,,geoclue"
PACKAGECONFIG[gypsy] = "-DFEATURE_gypsy=ON,-DFEATURE_gypsy=OFF,gconf gypsy"
PACKAGECONFIG[nmea] = ",,qtserialport"
PACKAGECONFIG[qml] = ",,qtdeclarative"
PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"

2
recipes-qt/qt6/qtquicktimeline_git.bb
View File

@ -9,5 +9,5 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
DEPENDS = "qtbase qtdeclarative qtdeclarative-native"

2
recipes-qt/qt6/qtsensors_git.bb
View File

@ -12,5 +12,5 @@ inherit qt6-cmake pkgconfig
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

4
recipes-qt/qt6/qtwebchannel_git.bb
View File

@ -15,6 +15,6 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
PACKAGECONFIG ?= "qml"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
PACKAGECONFIG[qml] = ",,qtdeclarative"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtwebsockets"
PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"

2
recipes-qt/qt6/qtwebengine_git.bb
View File

@ -8,7 +8,7 @@ DEPENDS += " \
qemu-native \
nss nss-native \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst libxkbfile', '', d)} \
qtbase qtdeclarative \
qtbase qtdeclarative qtdeclarative-native \
gn-native \
"

2
recipes-qt/qt6/qtwebsockets_git.bb
View File

@ -11,5 +11,5 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

2
recipes-qt/qt6/qtwebview_git.bb
View File

@ -11,4 +11,4 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtwebengine"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtwebengine"