diff options
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 9 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 31783ee68b..b0afc5af7e 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -644,15 +644,6 @@ static void qDefaultMessageHandler(QtMsgType type, const QMessageLogContext &con /*! \internal */ -static void qDefaultMessageHandler2(QtMsgType type, const QMessageLogContext &context, - const char *buf) -{ - qDefaultMessageHandler(type, context, QString::fromLocal8Bit(buf)); -} - -/*! - \internal -*/ static void qDefaultMsgHandler(QtMsgType type, const char *buf) { QMessageLogContext emptyContext; diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 493661bad1..e473cb26b2 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -3927,7 +3927,7 @@ QByteArray QString::toLatin1() const \sa fromAscii(), toLatin1(), toUtf8(), toLocal8Bit(), QTextCodec */ -#if !defined(Q_OS_MAC) && defined(Q_OS_UNIX) +#if !defined(Q_OS_MAC) && defined(Q_OS_UNIX) && !defined(QT_USE_ICU) static QByteArray toLocal8Bit_helper(const QChar *data, int length) { #ifndef QT_NO_TEXTCODEC |