CONFIG_PACKAGE_qt5base-gui \
CONFIG_PACKAGE_qt5base-plugin-imageformats-gif \
CONFIG_PACKAGE_qt5base-plugin-platforms-linuxfb \
- CONFIG_PACKAGE_qt5base-plugin-platforms-minimal \
- CONFIG_PACKAGE_libiconv-full
+ CONFIG_PACKAGE_qt5base-plugin-platforms-minimal
define Package/qt5base/Default
SECTION:=video-frameworks
define Package/qt5base-core
$(call Package/qt5base/Default)
TITLE+=core
- DEPENDS+=+libpthread +zlib +libpcre16 +libstdcpp +librt +PACKAGE_libiconv-full:libiconv-full
+ DEPENDS+=+libpthread +zlib +libpcre16 +libstdcpp +librt $(ICONV_DEPENDS)
endef
define Package/qt5base-gui
-widgets \
-no-optimized-qmake \
-no-cups \
- $(if $(CONFIG_PACKAGE_libiconv-full),-iconv,-no-iconv) \
+ $(if $(CONFIG_BUILD_NLS),-iconv,-no-iconv) \
-evdev \
-no-icu \
-fontconfig \
--- /dev/null
+--- a/config.tests/unix/iconv/iconv.pro
++++ b/config.tests/unix/iconv/iconv.pro
+@@ -1,3 +1,3 @@
+ SOURCES = iconv.cpp
+ CONFIG -= qt dylib
+-mac|mingw|qnx:LIBS += -liconv
++mac|mingw|qnx|linux:LIBS += -liconv
+--- a/src/corelib/codecs/codecs.pri
++++ b/src/corelib/codecs/codecs.pri
+@@ -44,6 +44,7 @@ contains(QT_CONFIG,icu) {
+ contains(QT_CONFIG,iconv) {
+ HEADERS += codecs/qiconvcodec_p.h
+ SOURCES += codecs/qiconvcodec.cpp
++ LIBS_PRIVATE *= -liconv
+ } else:contains(QT_CONFIG,gnu-libiconv) {
+ HEADERS += codecs/qiconvcodec_p.h
+ SOURCES += codecs/qiconvcodec.cpp