diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-17 12:33:40 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-20 02:04:38 +0200 |
commit | 18ec53156ee704fdb4977436fccfdc85333e614b (patch) | |
tree | df734ce7893d570f4a90f923fcfe9c80ddc3de05 /src/tools | |
parent | 4455de24d453138411c57bae55af18f3fba58d4b (diff) |
Move QTextCodec support out of QtCore
* Assume UTF-8 on all Unix like systems
* Export some functions to be able to compile QTextCodec once
moved to Qt5Compat.
Task-number: QTBUG-75665
Change-Id: I52ec47a848bc0ba72e9c7689668b1bcc5d736c29
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/uic/qclass_lib_map.h | 3 | ||||
-rw-r--r-- | src/tools/uic/uic.pro | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index cafb255a48..ae6fa911c5 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -6,9 +6,6 @@ QT_CLASS_LIB(QPauseAnimation, QtCore, qpauseanimation.h) QT_CLASS_LIB(QPropertyAnimation, QtCore, qpropertyanimation.h) QT_CLASS_LIB(QSequentialAnimationGroup, QtCore, qsequentialanimationgroup.h) 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(QFuture, QtCore, qfuture.h) QT_CLASS_LIB(QFutureIterator, QtCore, qfuture.h) QT_CLASS_LIB(QMutableFutureIterator, QtCore, qfuture.h) diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro index 1bf8ef8ad3..8b579cb575 100644 --- a/src/tools/uic/uic.pro +++ b/src/tools/uic/uic.pro @@ -1,5 +1,5 @@ option(host_build) -!force_bootstrap:if(!qtConfig(commandlineparser)|!qtConfig(textcodec)|!qtConfig(xmlstreamreader)|!qtConfig(xmlstreamwriter)): \ +!force_bootstrap:if(!qtConfig(commandlineparser)|!qtConfig(xmlstreamreader)|!qtConfig(xmlstreamwriter)): \ CONFIG += force_bootstrap DEFINES += QT_UIC QT_NO_CAST_FROM_ASCII QT_NO_FOREACH |