summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter K├╝mmel <syntheticpp@gmx.net>2012-10-23 09:03:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-03 16:16:35 +0100
commit9764907240b7834abd4647e4a856d08aa414b578 (patch)
tree4f4b665376ad558b8fd2493f6d5ef83b061d6111
parentccc4fbdf3f31bcc564c989f077a84e8e1400ac60 (diff)
QTscii and QIscii are not big codecs
This fixes the build when QT_NO_BIG_CODECS is defined. Change-Id: I832fb8ba5df6c4a6c1db9bdaecc498690357a56a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/codecs/qisciicodec.cpp4
-rw-r--r--src/corelib/codecs/qisciicodec_p.h2
-rw-r--r--src/corelib/codecs/qtsciicodec.cpp4
-rw-r--r--src/corelib/codecs/qtsciicodec_p.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/codecs/qisciicodec.cpp b/src/corelib/codecs/qisciicodec.cpp
index d2d6376056..2eeeb24e51 100644
--- a/src/corelib/codecs/qisciicodec.cpp
+++ b/src/corelib/codecs/qisciicodec.cpp
@@ -42,7 +42,7 @@
#include "qtextcodec_p.h"
#include "qlist.h"
-#ifndef QT_NO_BIG_CODECS
+#ifndef QT_NO_CODECS
QT_BEGIN_NAMESPACE
@@ -293,4 +293,4 @@ QString QIsciiCodec::convertToUnicode(const char* chars, int len, ConverterState
QT_END_NAMESPACE
-#endif // QT_NO_BIG_CODECS
+#endif // QT_NO_CODECS
diff --git a/src/corelib/codecs/qisciicodec_p.h b/src/corelib/codecs/qisciicodec_p.h
index 8482f2ac36..a1bc0bf297 100644
--- a/src/corelib/codecs/qisciicodec_p.h
+++ b/src/corelib/codecs/qisciicodec_p.h
@@ -57,7 +57,7 @@
QT_BEGIN_NAMESPACE
-#ifndef QT_NO_BIG_CODECS
+#ifndef QT_NO_CODECS
class QIsciiCodec : public QTextCodec {
public:
diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp
index 0933289d0e..c45f966750 100644
--- a/src/corelib/codecs/qtsciicodec.cpp
+++ b/src/corelib/codecs/qtsciicodec.cpp
@@ -46,7 +46,7 @@
#include "qtsciicodec_p.h"
#include "qlist.h"
-#ifndef QT_NO_BIG_CODECS
+#ifndef QT_NO_CODECS
QT_BEGIN_NAMESPACE
@@ -496,4 +496,4 @@ static unsigned int qt_TSCIIToUnicode(uint code, uint *s)
QT_END_NAMESPACE
-#endif // QT_NO_BIG_CODECS
+#endif // QT_NO_CODECS
diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h
index 4a5727a808..ea83391cb3 100644
--- a/src/corelib/codecs/qtsciicodec_p.h
+++ b/src/corelib/codecs/qtsciicodec_p.h
@@ -86,7 +86,7 @@
QT_BEGIN_NAMESPACE
-#ifndef QT_NO_BIG_CODECS
+#ifndef QT_NO_CODECS
class QTsciiCodec : public QTextCodec {
public:
@@ -99,7 +99,7 @@ public:
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const;
};
-#endif // QT_NO_BIG_CODECS
+#endif // QT_NO_CODECS
QT_END_NAMESPACE