Commit 53fbd8a7 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

qt5base: add support to build against ICU 



Qt5Webkit requires Qt5Base to be built with ICU support, so we add
such support.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent f8ffed2d

package/qt5/qt5base/Config.in

+7 −0
Original line number Diff line number Diff line
@@ -140,4 +140,11 @@ config BR2_PACKAGE_QT5BASE_DBUS 
	help

	  This option enables the D-Bus module.



config BR2_PACKAGE_QT5BASE_ICU

	bool "Enable ICU support"

	select BR2_PACKAGE_ICU

	help

	  This option enables ICU support in Qt5. This is for example

	  needed for Qt5Webkit.



endif

package/qt5/qt5base/qt5base.mk

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ QT5BASE_CONFIGURE_OPTS += \ 
	-no-nis \

	-no-libudev \

	-no-iconv \

	-no-icu \

	-no-gstreamer \

	-no-gtkstyle \

	-system-zlib \
@@ -97,6 +96,9 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus) 
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib)

QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)



QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_ICU),-icu,-no-icu)

QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)



# Build the list of libraries to be installed on the target

QT5BASE_INSTALL_LIBS_y                                 += Qt5Core

QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network