checkForCodecs is not used when QT_LOCALE_IS_UTF8 is defined

Change-Id: I3d82863cbd123dbf73eb8f5721ef9294e6365de6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Jiang Jiang 2012-08-31 16:36:45 +02:00 committed by Qt by Nokia
parent 6db03bbc63
commit e0ce39ea67

View File

@ -131,7 +131,7 @@ bool qTextCodecNameMatch(const char *n, const char *h)
}
#if !defined(Q_OS_WIN32) && !defined(Q_OS_WINCE)
#if !defined(Q_OS_WIN32) && !defined(Q_OS_WINCE) && !defined(QT_LOCALE_IS_UTF8)
static QTextCodec *checkForCodec(const QByteArray &name) {
QTextCodec *c = QTextCodec::codecForName(name);
if (!c) {