diff options
| author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-09-12 13:30:06 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-16 11:02:43 +0200 |
| commit | 9495309622620d3e029671226d37d311dcb9e28a (patch) | |
| tree | a4c5b2f02eb11800202c6a4e86fa73d234e2125c /src/corelib/codecs | |
| parent | 1e3269c0863bfac26be9e9239b6427ea77c6175b (diff) | |
Exclude QIcuCodec when QT_NO_TEXTCODEC is defined
Change-Id: Iec0178c427abcc1c79e4fe6ef449d399ac8ca363
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/qicucodec.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/codecs/qicucodec_p.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/codecs/qicucodec.cpp b/src/corelib/codecs/qicucodec.cpp index e348e68753..381de2d393 100644 --- a/src/corelib/codecs/qicucodec.cpp +++ b/src/corelib/codecs/qicucodec.cpp @@ -40,6 +40,9 @@ ****************************************************************************/ #include "qicucodec_p.h" + +#ifndef QT_NO_TEXTCODEC + #include "qtextcodec_p.h" #include "qutfcodec_p.h" #include "qlatincodec_p.h" @@ -682,3 +685,4 @@ int QIcuCodec::mibEnum() const QT_END_NAMESPACE +#endif // QT_NO_TEXTCODEC diff --git a/src/corelib/codecs/qicucodec_p.h b/src/corelib/codecs/qicucodec_p.h index 2d3f21481d..b686f42a5f 100644 --- a/src/corelib/codecs/qicucodec_p.h +++ b/src/corelib/codecs/qicucodec_p.h @@ -61,6 +61,8 @@ extern "C" { QT_BEGIN_NAMESPACE +#ifndef QT_NO_TEXTCODEC + class QIcuCodec : public QTextCodec { public: @@ -88,6 +90,8 @@ private: const char *m_name; }; +#endif // QT_NO_TEXTCODEC + QT_END_NAMESPACE #endif |