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/tools | |
| 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/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 3aa9bebe30..69aa55da7f 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -42,7 +42,6 @@ DEPENDPATH += $$INCLUDEPATH \ SOURCES += \ ../../corelib/codecs/qlatincodec.cpp \ - ../../corelib/codecs/qsimplecodec.cpp \ ../../corelib/codecs/qtextcodec.cpp \ ../../corelib/codecs/qutfcodec.cpp \ ../../corelib/global/qglobal.cpp \ @@ -64,6 +63,7 @@ SOURCES += \ ../../corelib/io/qfiledevice.cpp \ ../../corelib/io/qtemporaryfile.cpp \ ../../corelib/io/qtextstream.cpp \ + ../../corelib/kernel/qcoreglobaldata.cpp \ ../../corelib/kernel/qmetatype.cpp \ ../../corelib/kernel/qvariant.cpp \ ../../corelib/kernel/qsystemerror.cpp \ |