diff options
| author | Pierre Rossi <pierre.rossi@nokia.com> | 2010-06-22 16:14:42 (GMT) |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@nokia.com> | 2010-06-30 20:00:29 (GMT) |
| commit | 5eefab7dfaf11c2c53c1fa856b6ed94b39d5a688 (patch) | |
| tree | 02860e73dab95b71b73ce00b6c65a3552e03819f /src/corelib | |
| parent | 6a218a31de60ea6f3f75fb6df014ef7323a264d6 (diff) | |
| download | Qt-5eefab7dfaf11c2c53c1fa856b6ed94b39d5a688.zip Qt-5eefab7dfaf11c2c53c1fa856b6ed94b39d5a688.tar.gz Qt-5eefab7dfaf11c2c53c1fa856b6ed94b39d5a688.tar.bz2 | |
Use built-in iconv on Solaris if available
Task-number: QTBUG-1853
Reviewed-by: Thiago
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/codecs/codecs.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index c572e08..46d7dd4 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -31,6 +31,10 @@ unix { 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 += \ |