From f7692d6533f377f102a27f11cde23d09b9aca16e Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:27 +0200 Subject: [PATCH] package/qt6/qt6base: add blind option to enable Network support on host The Network module is explicitly required by qt6tools. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in.host | 5 +++++ package/qt6/qt6base/qt6base.mk | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 326c06278e..286da0ff03 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -2,3 +2,8 @@ # Qt Shader Baker(qsb)). config BR2_PACKAGE_HOST_QT6BASE_GUI bool + +# Select this if you need host qt6 tools that require the Qt::Network module +# (e.g. Qt Tools). +config BR2_PACKAGE_HOST_QT6BASE_NETWORK + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 57f88e7779..8ab4d408bb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -88,7 +88,6 @@ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_xml=ON \ -DFEATURE_sql=OFF \ -DFEATURE_testlib=OFF \ - -DFEATURE_network=OFF \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ @@ -123,6 +122,13 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +# The Network module is explicitly required by qt6tools. +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF +endif + # Conditional blocks below are ordered by alphabetic ordering of the # BR2_PACKAGE_* option.