From 38d4618eb5f9b7293513267f9f5749aa2568e08c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 23 Jan 2012 23:12:46 +0100 Subject: [PATCH] remove vestiges of text codec plugins follow-up to 3a3356a85079d734dfa57205a00e1996afc033df Change-Id: Iba84958cbcd105ec702568752090719cc108e101 Reviewed-by: Lars Knoll --- src/corelib/global/qfeatures.txt | 7 ------- src/tools/uic/qclass_lib_map.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index c7c230ca42..edbe34595e 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -976,13 +976,6 @@ SeeAlso: ??? # Internationalization -Feature: TEXTCODECPLUGIN -Description: Supports custom text codecs that can be loaded dynamically into applications. -Section: Internationalization -Requires: TEXTCODEC LIBRARY -Name: QTextCodecPlugin -SeeAlso: ??? - Feature: TRANSLATION Description: Supports translations using QObject::tr(). Section: Internationalization diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index 9ef0e2fa7d..df953d62d8 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -9,8 +9,6 @@ QT_CLASS_LIB(QVariantAnimation, QtCore, qvariantanimation.h) QT_CLASS_LIB(QTextCodec, QtCore, qtextcodec.h) QT_CLASS_LIB(QTextEncoder, QtCore, qtextcodec.h) QT_CLASS_LIB(QTextDecoder, QtCore, qtextcodec.h) -QT_CLASS_LIB(QTextCodecFactoryInterface, QtCore, qtextcodecplugin.h) -QT_CLASS_LIB(QTextCodecPlugin, QtCore, qtextcodecplugin.h) QT_CLASS_LIB(QFuture, QtCore, qfuture.h) QT_CLASS_LIB(QFutureIterator, QtCore, qfuture.h) QT_CLASS_LIB(QMutableFutureIterator, QtCore, qfuture.h)