From 1caa8366b826dc81bfda9bafc48d7ecf84d06ca4 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Mon, 2 Jun 2025 10:00:52 +0200 Subject: [PATCH] package/qt6/qt6base: remove unused hidden host option The previous commit removed its only user. It was a blind option so no legacy handling is needed. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Arnout Vandecappelle (cherry picked from commit 1fad08d32f9f029cb0d11f4dcd805b479df7ab59) Signed-off-by: Thomas Perale --- package/qt6/qt6base/Config.in.host | 5 ----- package/qt6/qt6base/qt6base.mk | 10 +--------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index e38e99fbaf..bc605c6821 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -16,10 +16,5 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK 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 - config BR2_PACKAGE_HOST_QT6BASE_WIDGETS bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 39fb440be7..51a4f1b5be 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -89,6 +89,7 @@ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ + -DFEATURE_sql=OFF \ -DFEATURE_system_doubleconversion=ON \ -DFEATURE_system_libb2=ON \ -DFEATURE_system_pcre2=ON \ @@ -139,15 +140,6 @@ 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