diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index ff0878d..bae9ad7 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -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" diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb index 3c393b5..8c2b019 100644 --- a/recipes-qt/qt6/qt5compat_git.bb +++ b/recipes-qt/qt6/qt5compat_git.bb @@ -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" diff --git a/recipes-qt/qt6/qt6.inc b/recipes-qt/qt6/qt6.inc index 5322ece..9f0b25f 100644 --- a/recipes-qt/qt6/qt6.inc +++ b/recipes-qt/qt6/qt6.inc @@ -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" diff --git a/recipes-qt/qt6/qtcharts_git.bb b/recipes-qt/qt6/qtcharts_git.bb index be915a1..60254be 100644 --- a/recipes-qt/qt6/qtcharts_git.bb +++ b/recipes-qt/qt6/qtcharts_git.bb @@ -11,5 +11,5 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" PACKAGECONFIG ?= "qml" -PACKAGECONFIG[qml] = ",,qtdeclarative" +PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native" diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb index 4a45fed..3c4c98c 100644 --- a/recipes-qt/qt6/qtcoap_git.bb +++ b/recipes-qt/qt6/qtcoap_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtconnectivity_git.bb b/recipes-qt/qt6/qtconnectivity_git.bb index 517648d..ab6ac10 100644 --- a/recipes-qt/qt6/qtconnectivity_git.bb +++ b/recipes-qt/qt6/qtconnectivity_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtdatavis3d_git.bb b/recipes-qt/qt6/qtdatavis3d_git.bb index 2ea621c..20e9aca 100644 --- a/recipes-qt/qt6/qtdatavis3d_git.bb +++ b/recipes-qt/qt6/qtdatavis3d_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtlottie_git.bb b/recipes-qt/qt6/qtlottie_git.bb index dc81cf3..0002377 100644 --- a/recipes-qt/qt6/qtlottie_git.bb +++ b/recipes-qt/qt6/qtlottie_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb index 67f1f69..5e495d8 100644 --- a/recipes-qt/qt6/qtmqtt_git.bb +++ b/recipes-qt/qt6/qtmqtt_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtmultimedia_git.bb b/recipes-qt/qt6/qtmultimedia_git.bb index e60cb86..c4bcc68 100644 --- a/recipes-qt/qt6/qtmultimedia_git.bb +++ b/recipes-qt/qt6/qtmultimedia_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index 71143e3..58173a6 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -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 diff --git a/recipes-qt/qt6/qtpositioning_git.bb b/recipes-qt/qt6/qtpositioning_git.bb index 5cac69b..7fb4957 100644 --- a/recipes-qt/qt6/qtpositioning_git.bb +++ b/recipes-qt/qt6/qtpositioning_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index e14cff2..ef06b55 100644 --- a/recipes-qt/qt6/qtquicktimeline_git.bb +++ b/recipes-qt/qt6/qtquicktimeline_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtsensors_git.bb b/recipes-qt/qt6/qtsensors_git.bb index 4bb0f75..28b6fc3 100644 --- a/recipes-qt/qt6/qtsensors_git.bb +++ b/recipes-qt/qt6/qtsensors_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtwebchannel_git.bb b/recipes-qt/qt6/qtwebchannel_git.bb index ec03598..31987dc 100644 --- a/recipes-qt/qt6/qtwebchannel_git.bb +++ b/recipes-qt/qt6/qtwebchannel_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtwebengine_git.bb b/recipes-qt/qt6/qtwebengine_git.bb index f23f4ae..2f09bac 100644 --- a/recipes-qt/qt6/qtwebengine_git.bb +++ b/recipes-qt/qt6/qtwebengine_git.bb @@ -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 \ " diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb index db7d770..040b0c6 100644 --- a/recipes-qt/qt6/qtwebsockets_git.bb +++ b/recipes-qt/qt6/qtwebsockets_git.bb @@ -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" diff --git a/recipes-qt/qt6/qtwebview_git.bb b/recipes-qt/qt6/qtwebview_git.bb index aa6dad3..bb64bc0 100644 --- a/recipes-qt/qt6/qtwebview_git.bb +++ b/recipes-qt/qt6/qtwebview_git.bb @@ -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"