From 5af9ecafd9c14f39bec5fed3192a266ec9e31ffe Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 20 Jul 2012 10:00:52 +0200 Subject: 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 --- src/tools/bootstrap/bootstrap.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools/bootstrap/bootstrap.pro') 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 \ -- cgit v1.2.3