From 663c9ead3c00bd4ba1f915ea9b4d7b1785484374 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Tue, 25 Jun 2024 23:18:29 +0200 Subject: [PATCH] package/qt6/qt6base: add blind option to enable Sql support on host We need host qt6base with Sql support for host-qt6tools to generate the qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not available. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in.host | 5 +++++ package/qt6/qt6base/qt6base.mk | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 80bc13c7dc..46fb668817 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -12,3 +12,8 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK # (e.g. qmltestrunner). config BR2_PACKAGE_HOST_QT6BASE_TEST bool + +# Select this if you need host qt6 tools that require the Qt::Sql module +# (e.g. qhelpgenerator). +config BR2_PACKAGE_HOST_QT6BASE_SQL + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index c6bd15fec2..6cb82d9a94 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -86,7 +86,6 @@ HOST_QT6BASE_DEPENDENCIES = \ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=ON \ - -DFEATURE_sql=OFF \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ @@ -128,6 +127,15 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF endif +# We need host qt6base with Sql support for host-qt6tools to generate the +# qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not +# available. +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF +endif + # We need host-qt6base with Testlib support when building host-qt6declarative # with QuickTest support. QuickTest support is further required for building the # qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is