From edce4936b481c8a7d911e0776bddc365f3ce6169 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Jan 2025 14:45:58 +0000 Subject: [PATCH] qtopcua: add opcua tools to sdk QtOpcua has host tools that need to be included in the SDK. Add additional PACKAGECONFIG for open62541 which has openssl dependency. Mingw32 does not support this in nativesdk builds, but it's also not necessary for either native or nativesdk builds. Pick-to: 6.9 6.8 Fixes: QTBUG-132822 Change-Id: Ib0c9f7634ac578882ca5585be430312736f61470 Reviewed-by: Mikko Gronoff --- .../nativesdk-packagegroup-qt6-toolchain-host-addons.bb | 2 ++ recipes-qt/qt6/qtopcua_git.bb | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb index 1eddf56..147b428 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb @@ -15,6 +15,8 @@ RDEPENDS:${PN} += " \ nativesdk-qtgrpc-tools \ nativesdk-qtquick3d-dev \ nativesdk-qtquick3d-tools \ + nativesdk-qtopcua-dev \ + nativesdk-qtopcua-tools \ nativesdk-qtremoteobjects-dev \ nativesdk-qtremoteobjects-tools \ nativesdk-qtscxml-dev \ diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index 4fc95e5..0b05bc8 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -24,8 +24,11 @@ inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc -PACKAGECONFIG ?= "qml" +PACKAGECONFIG ?= "qml open62541" +PACKAGECONFIG:class-native ?= "" +PACKAGECONFIG:class-nativesdk ?= "" PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native" +PACKAGECONFIG[open62541] = "-DFEATURE_open62541=ON,-DFEATURE_open62541=OFF,openssl" # src/3rdparty/open62541.pri adds -Wno-format, causing following error # because -Wformat-security cannot be used together with -Wno-format