2
1
Эх сурвалжийг харах

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 <roykollensvendsen@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
Roy Kollen Svendsen 2 сар өмнө
parent
commit
1fad08d32f

+ 0 - 5
package/qt6/qt6base/Config.in.host

@@ -16,10 +16,5 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK
 config BR2_PACKAGE_HOST_QT6BASE_TEST
 config BR2_PACKAGE_HOST_QT6BASE_TEST
 	bool
 	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
 config BR2_PACKAGE_HOST_QT6BASE_WIDGETS
 	bool
 	bool

+ 1 - 9
package/qt6/qt6base/qt6base.mk

@@ -89,6 +89,7 @@ HOST_QT6BASE_CONF_OPTS = \
 	-DFEATURE_dbus=OFF \
 	-DFEATURE_dbus=OFF \
 	-DFEATURE_icu=OFF \
 	-DFEATURE_icu=OFF \
 	-DFEATURE_glib=OFF \
 	-DFEATURE_glib=OFF \
+	-DFEATURE_sql=OFF \
 	-DFEATURE_system_doubleconversion=ON \
 	-DFEATURE_system_doubleconversion=ON \
 	-DFEATURE_system_libb2=ON \
 	-DFEATURE_system_libb2=ON \
 	-DFEATURE_system_pcre2=ON \
 	-DFEATURE_system_pcre2=ON \
@@ -139,15 +140,6 @@ else
 HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
 HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
 endif
 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
 # We need host-qt6base with Testlib support when building host-qt6declarative
 # with QuickTest support. QuickTest support is further required for building the
 # with QuickTest support. QuickTest support is further required for building the
 # qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is
 # qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is