--- a/src/corelib/codecs/codecs.pri	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/corelib/codecs/codecs.pri	Wed Aug 18 10:37:55 2010 +0300
@@ -31,6 +31,10 @@
 
                 DEFINES += GNU_LIBICONV
                 !mac:LIBS_PRIVATE *= -liconv
+        } else:contains(QT_CONFIG,sun-libiconv) {
+                HEADERS += codecs/qiconvcodec_p.h
+                SOURCES += codecs/qiconvcodec.cpp
+                DEFINES += GNU_LIBICONV
         } else:!symbian {
                 # no iconv, so we put all plugins in the library
                 HEADERS += \