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/global/qfeatures.txt | |
| 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/global/qfeatures.txt')
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index f0b8b470c5..564884c381 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -960,6 +960,13 @@ Requires: TEXTCODEC Name: Big Codecs SeeAlso: ??? +Feature: ICONV +Description: Supports conversions between text encodings using iconv. +Section: Internationalization +Requires: TEXTCODEC +Name: iconv +SeeAlso: ??? + # Networking Feature: HOSTINFO |