diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-07-20 10:00:52 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 11:11:43 +0200 |
| commit | 5af9ecafd9c14f39bec5fed3192a266ec9e31ffe (patch) | |
| tree | 5b057af18521a688f99ccde68f214a9cca492f6f /src/corelib/codecs/qtextcodec.h | |
| parent | 920dcb0158e191f0eadf4bec0645348cfb6e9619 (diff) | |
Move the text codec list to qcoreglobaldata.
This removes some global statics in QTextCodec and
makes the code better to maintain in the longer term.
Remove QT_NO_THREAD defines around mutexes as this
isn't required in Qt 5 anymore.
Change-Id: I15ede75f53b16f134f4053f3188c4b47e86fcd8a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/codecs/qtextcodec.h')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index 65cf61c44a..09893c0ddf 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -129,8 +129,7 @@ protected: virtual ~QTextCodec(); private: - friend class QTextCodecCleanup; - static bool validCodecs(); + friend struct QCoreGlobalData; }; Q_DECLARE_OPERATORS_FOR_FLAGS(QTextCodec::ConversionFlags) |