diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-07-25 12:57:15 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 11:12:58 +0200 |
| commit | 8a883d972da3b28d87689c4d4d9c9b5e5b1dcba1 (patch) | |
| tree | 9af454a745561dcdc0d0478c410ef58b916ada49 /src/corelib/codecs/qtextcodec_p.h | |
| parent | bb3637d33c122a5add502239c57dff8afcc555c8 (diff) | |
Do not preload any codecs anymore when using ICU
When using ICU we can now avoid pre loading any codecs
at startup. Instead QTextCodecs will always be created
lazily when first asked for.
Change-Id: Ic668f2824700896d2eca7d0de54f978404826163
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/codecs/qtextcodec_p.h')
| -rw-r--r-- | src/corelib/codecs/qtextcodec_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/codecs/qtextcodec_p.h b/src/corelib/codecs/qtextcodec_p.h index d13835910d..532670d0d5 100644 --- a/src/corelib/codecs/qtextcodec_p.h +++ b/src/corelib/codecs/qtextcodec_p.h @@ -60,6 +60,10 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_TEXTCODEC +#if defined(Q_OS_MAC) || defined(Q_OS_IOS) || defined(Q_OS_LINUX_ANDROID) || defined(Q_OS_QNX) +#define QT_LOCALE_IS_UTF8 +#endif + typedef void (*QTextCodecStateFreeFunction)(QTextCodec::ConverterState*); struct QTextCodecUnalignedPointer @@ -77,6 +81,8 @@ struct QTextCodecUnalignedPointer } }; +bool qTextCodecNameMatch(const char *a, const char *b); + #else class QTextCodec |