diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-01-12 10:43:29 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-20 18:48:22 +0100 |
| commit | 3a3356a85079d734dfa57205a00e1996afc033df (patch) | |
| tree | 1be52f3f40b313080dde28dbdffac486ce33d8f4 /src/corelib/global | |
| parent | 712cfb509484599f1586f68cc379e3e7464e9967 (diff) | |
remove obsolete codec plugin loading code
Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qconfig-medium.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-minimal.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-nacl.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-small.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.h | 5 |
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 |