summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qconfig-bootstrapped.h
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2020-06-17 12:33:40 +0200
committerKarsten Heimrich <karsten.heimrich@qt.io>2020-06-20 02:04:38 +0200
commit18ec53156ee704fdb4977436fccfdc85333e614b (patch)
treedf734ce7893d570f4a90f923fcfe9c80ddc3de05 /src/corelib/global/qconfig-bootstrapped.h
parent4455de24d453138411c57bae55af18f3fba58d4b (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/corelib/global/qconfig-bootstrapped.h')
-rw-r--r--src/corelib/global/qconfig-bootstrapped.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
index 6ef4acf503..a9a20a231c 100644
--- a/src/corelib/global/qconfig-bootstrapped.h
+++ b/src/corelib/global/qconfig-bootstrapped.h
@@ -93,7 +93,6 @@
#define QT_FEATURE_getentropy -1
#define QT_NO_GEOM_VARIANT
#define QT_FEATURE_hijricalendar -1
-#define QT_FEATURE_iconv -1
#define QT_FEATURE_icu -1
#define QT_FEATURE_islamiccivilcalendar -1
#define QT_FEATURE_jalalicalendar -1
@@ -141,8 +140,6 @@
#define QT_FEATURE_zstd -1
#endif
-#define QT_FEATURE_textcodec -1
-
#ifdef QT_BUILD_QMAKE
#define QT_FEATURE_commandlineparser -1
#define QT_NO_COMPRESS