define QT_NO_ICONV if QT_NO_TEXTCODEC
authorJeremy Katz <jeremy.katz@nokia.com>
Mon, 18 Jun 2012 20:08:00 +0000 (22:08 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 20 Jun 2012 10:38:32 +0000 (12:38 +0200)
commit23e3c703a1ea36083b05f1296e823162c8d24bd5
tree6caf51ccede6b2ba0f73d387f34e231875dc48b9
parent6eed1ff9d5c28c8653e36f2d9e0ef18d3f831d69
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>
src/corelib/codecs/qiconvcodec.cpp
src/corelib/global/qfeatures.h
src/corelib/global/qfeatures.txt