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>

diff --git a/src/corelib/codecs/qicucodec.cpp b/src/corelib/codecs/qicucodec.cpp
index e348e68..381de2d 100644 (file)
--- 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 2d3f214..b686f42 100644 (file)
--- 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