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

Revert "package/qt6/qt6base: allow selecting the host print support module"

This reverts commit c8662264eb6316334d77bb189bd6057976ef5876.

Thanks to
7b9e0ec57c660554ef6c46c0cfdfdd5a6db24e27 ("package/qt6/qt6tools: allow
building linguist tools without printsupport"), this is in fact not
needed, as linguist for the host can be built without having
printsupport in host-qt6base, so let's drop the hidden options that
are now unused.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Thomas Petazzoni 10 сар өмнө
parent
commit
aba638007f

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

@@ -8,11 +8,6 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI
 config BR2_PACKAGE_HOST_QT6BASE_NETWORK
 	bool
 
-# The Qt Widgets module is required for printsupport
-config BR2_PACKAGE_HOST_QT6BASE_PRINTSUPPORT
-	bool
-	select BR2_PACKAGE_HOST_QT6BASE_WIDGETS
-
 # Select this if you need host qt6 tools that require the Qt::Test module
 # (e.g. qmltestrunner).
 config BR2_PACKAGE_HOST_QT6BASE_TEST
@@ -22,7 +17,3 @@ config BR2_PACKAGE_HOST_QT6BASE_TEST
 # (e.g. qhelpgenerator).
 config BR2_PACKAGE_HOST_QT6BASE_SQL
 	bool
-
-config BR2_PACKAGE_HOST_QT6BASE_WIDGETS
-	bool
-	select BR2_PACKAGE_HOST_QT6BASE_GUI

+ 2 - 12
package/qt6/qt6base/qt6base.mk

@@ -113,8 +113,10 @@ HOST_QT6BASE_CONF_OPTS += \
 	-DFEATURE_png=OFF \
 	-DFEATURE_gif=OFF \
 	-DFEATURE_jpeg=OFF \
+	-DFEATURE_printsupport=OFF \
 	-DFEATURE_kms=OFF \
 	-DFEATURE_fontconfig=OFF \
+	-DFEATURE_widgets=OFF \
 	-DFEATURE_libinput=OFF \
 	-DFEATURE_tslib=OFF \
 	-DFEATURE_eglfs=OFF
@@ -129,12 +131,6 @@ else
 HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_HOST_QT6BASE_PRINTSUPPORT),y)
-HOST_QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON
-else
-HOST_QT6BASE_CONF_OPTS += -DFEATURE_printsupport=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.
@@ -154,12 +150,6 @@ else
 HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_HOST_QT6BASE_WIDGETS),y)
-HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON
-else
-HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF
-endif
-
 # Conditional blocks below are ordered by alphabetic ordering of the
 # BR2_PACKAGE_* option.