Remove unused static functions from qlogging.cpp, qstring.cpp.

Change-Id: I4e9642b5e7fb57ac56511ae06af6ce416d0401ec
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index 31783ee..b0afc5a 100644 (file)
--- 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 493661b..e473cb2 100644 (file)
--- 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