summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qconfig-medium.h3
-rw-r--r--src/corelib/global/qconfig-minimal.h3
-rw-r--r--src/corelib/global/qconfig-nacl.h3
-rw-r--r--src/corelib/global/qconfig-small.h3
-rw-r--r--src/corelib/global/qfeatures.h5
5 files changed, 0 insertions, 17 deletions
diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h
index 96207d1cd8..779d4ef011 100644
--- a/src/corelib/global/qconfig-medium.h
+++ b/src/corelib/global/qconfig-medium.h
@@ -91,9 +91,6 @@
#ifndef QT_NO_CODECS
# define QT_NO_CODECS
#endif
-#ifndef QT_NO_TEXTCODECPLUGIN
-# define QT_NO_TEXTCODECPLUGIN
-#endif
#ifndef QT_NO_TRANSLATION
# define QT_NO_TRANSLATION
#endif
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
index 30440243de..29f7779a4c 100644
--- a/src/corelib/global/qconfig-minimal.h
+++ b/src/corelib/global/qconfig-minimal.h
@@ -164,9 +164,6 @@
#ifndef QT_NO_CODECS
# define QT_NO_CODECS
#endif
-#ifndef QT_NO_TEXTCODECPLUGIN
-# define QT_NO_TEXTCODECPLUGIN
-#endif
#ifndef QT_NO_TRANSLATION
# define QT_NO_TRANSLATION
#endif
diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
index 6b943ab422..45f012fa79 100644
--- a/src/corelib/global/qconfig-nacl.h
+++ b/src/corelib/global/qconfig-nacl.h
@@ -128,9 +128,6 @@
#ifndef QT_NO_CODECS
# define QT_NO_CODECS
#endif
-#ifndef QT_NO_TEXTCODECPLUGIN
-# define QT_NO_TEXTCODECPLUGIN
-#endif
#ifndef QT_NO_TRANSLATION
# define QT_NO_TRANSLATION
#endif
diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
index 84a5ec59d9..18dd051f5a 100644
--- a/src/corelib/global/qconfig-small.h
+++ b/src/corelib/global/qconfig-small.h
@@ -125,9 +125,6 @@
#ifndef QT_NO_CODECS
# define QT_NO_CODECS
#endif
-#ifndef QT_NO_TEXTCODECPLUGIN
-# define QT_NO_TEXTCODECPLUGIN
-#endif
#ifndef QT_NO_TRANSLATION
# define QT_NO_TRANSLATION
#endif
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 5055414834..c039f15c2f 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -633,11 +633,6 @@
#define QT_NO_TABDIALOG
#endif
-// QTextCodecPlugin
-#if !defined(QT_NO_TEXTCODECPLUGIN) && (defined(QT_NO_TEXTCODEC) || defined(QT_NO_LIBRARY))
-#define QT_NO_TEXTCODECPLUGIN
-#endif
-
// QColorDialog
#if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX))
#define QT_NO_COLORDIALOG