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 | |
| 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')
| -rw-r--r-- | src/corelib/codecs/qiconvcodec.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.h | 28 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 7 |
3 files changed, 29 insertions, 10 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 */ diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 3267e3e06e..7d1551aab6 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -115,6 +115,9 @@ // QImage::createHeuristicMask() //#define QT_NO_IMAGE_HEURISTIC_MASK +// Image Text +//#define QT_NO_IMAGE_TEXT + // QLCDNumber //#define QT_NO_LCDNUMBER @@ -284,11 +287,21 @@ #define QT_NO_FILESYSTEMMODEL #endif +// File Transfer Protocol +#if !defined(QT_NO_FTP) && (defined(QT_NO_TEXTDATE)) +#define QT_NO_FTP +#endif + // Hyper Text Transfer Protocol #if !defined(QT_NO_HTTP) && (defined(QT_NO_HOSTINFO)) #define QT_NO_HTTP #endif +// iconv +#if !defined(QT_NO_ICONV) && (defined(QT_NO_TEXTCODEC)) +#define QT_NO_ICONV +#endif + // QLibrary #if !defined(QT_NO_LIBRARY) && (defined(QT_NO_SETTINGS)) #define QT_NO_LIBRARY @@ -369,11 +382,6 @@ #define QT_NO_XMLSTREAMWRITER #endif -// Bearer Management -#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY) || defined(QT_NO_PROPERTIES)) -#define QT_NO_BEARERMANAGEMENT -#endif - // Context menu #if !defined(QT_NO_CONTEXTMENU) && (defined(QT_NO_MENU)) #define QT_NO_CONTEXTMENU @@ -384,11 +392,6 @@ #define QT_NO_DBUS #endif -// File Transfer Protocol -#if !defined(QT_NO_FTP) && (defined(QT_NO_TEXTDATE)) -#define QT_NO_FTP -#endif - // QInputContext #if !defined(QT_NO_IM) && (defined(QT_NO_LIBRARY)) #define QT_NO_IM @@ -474,6 +477,11 @@ #define QT_NO_STYLE_STYLESHEET #endif +// Bearer Management +#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY) || defined(QT_NO_NETWORKINTERFACE) || defined(QT_NO_PROPERTIES)) +#define QT_NO_BEARERMANAGEMENT +#endif + // QColorDialog #if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX)) #define QT_NO_COLORDIALOG 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 |