Merge remote branch 'gerrit/master' into refactor

Conflicts:
	config.tests/unix/opengldesktop/opengldesktop.cpp
	examples/itemviews/interview/interview.pro
	examples/mainwindows/mainwindow/mainwindow.pro
	examples/openvg/README
	examples/richtext/textedit/textedit.pro
	examples/tools/undo/undo.pro
	src/corelib/global/qglobal.h
	src/corelib/kernel/qcoreapplication.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qmetatype.h
	src/gui/kernel/qevent.cpp
	src/gui/kernel/qevent.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/painting/qpaintengine_raster_p.h
	src/gui/text/qfontdatabase.cpp
	src/opengl/qgl.h
	src/openvg/qpaintengine_vg.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	tests/auto/qmainwindow/qmainwindow.pro

Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234

1 files changed, 0 insertions, 58 deletions

diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 985f5153ea..0f919fb401 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -1427,48 +1427,6 @@ bool QTextCodec::canEncode(const QString& s) const
     return (state.invalidChars == 0);
 }
 
-#ifdef QT3_SUPPORT
-/*!
-    Returns a string representing the current language and
-    sublanguage, e.g. "pt" for Portuguese, or "pt_br" for Portuguese/Brazil.
-
-    \sa QLocale
-*/
-const char *QTextCodec::locale()
-{
-    static char locale[6];
-    QByteArray l = QLocale::system().name().toLatin1();
-    int len = qMin(l.length(), 5);
-    memcpy(locale, l.constData(), len);
-    locale[len] = '\0';
-
-    return locale;
-}
-
-/*!
-    \overload
-*/
-
-QByteArray QTextCodec::fromUnicode(const QString& uc, int& lenInOut) const
-{
-    QByteArray result = convertFromUnicode(uc.constData(), lenInOut, 0);
-    lenInOut = result.length();
-    return result;
-}
-
-/*!
-    \overload
-
-    \a a contains the source characters; \a len contains the number of
-    characters in \a a to use.
-*/
-QString QTextCodec::toUnicode(const QByteArray& a, int len) const
-{
-    len = qMin(a.size(), len);
-    return convertToUnicode(a.constData(), len, 0);
-}
-#endif
-
 /*!
     \overload
 
@@ -1552,22 +1510,6 @@ QByteArray QTextEncoder::fromUnicode(const QChar *uc, int len)
     return result;
 }
 
-#ifdef QT3_SUPPORT
-/*!
-  \overload
-
-  Converts \a lenInOut characters (not bytes) from \a uc, and returns the
-  result in a QByteArray. The number of characters read is returned in
-  the \a lenInOut parameter.
-*/
-QByteArray QTextEncoder::fromUnicode(const QString& uc, int& lenInOut)
-{
-    QByteArray result = c->fromUnicode(uc.constData(), lenInOut, &state);
-    lenInOut = result.length();
-    return result;
-}
-#endif
-
 /*!
     \class QTextDecoder
     \brief The QTextDecoder class provides a state-based decoder.