diff options
| author | Jeremy Katz <jeremy.katz@nokia.com> | 2012-06-18 22:08:00 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 12:38:32 +0200 |
| commit | 23e3c703a1ea36083b05f1296e823162c8d24bd5 (patch) | |
| tree | 6caf51ccede6b2ba0f73d387f34e231875dc48b9 /src/corelib/codecs | |
| parent | 6eed1ff9d5c28c8653e36f2d9e0ef18d3f831d69 (diff) | |
define QT_NO_ICONV if QT_NO_TEXTCODEC
This also updates qfeatures.h with various other things that have
been neglected. Run $QTSRCDIR/util/scripts/make_qfeatures_dot_h
after changing qfeatures.txt
Task-number: QTBUG-24816
Change-Id: I18b71fcec71efa9cfe3425fb1a7833456ec411b9
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/qiconvcodec.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp index 84a8e8d39d..c7c1d365b6 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp @@ -39,6 +39,8 @@ ** ****************************************************************************/ +#ifndef QT_NO_ICONV + #include "qiconvcodec_p.h" #include "qtextcodec_p.h" #include <qlibrary.h> @@ -553,3 +555,5 @@ iconv_t QIconvCodec::createIconv_t(const char *to, const char *from) } QT_END_NAMESPACE + +#endif /* #ifndef QT_NO_ICONV */ |