summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qfeatures.h
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2012-06-01 12:42:50 +0900
committerQt by Nokia <qt-info@nokia.com>2012-06-14 05:26:26 +0200
commit5a7937bb042a006482ed50f7b7de437e15e593ce (patch)
tree2dec8cc779774fb72cc58903f1f431126ab2f1cc /src/corelib/global/qfeatures.h
parentf00012aa89e2e07949a0f32f970f4e9be9405d4b (diff)
disable codecs for asian language when QT_NO_BIG_CODECS defined
Change-Id: I45025b13bacc5f63946b02a87c742beff1946c0b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/global/qfeatures.h')
-rw-r--r--src/corelib/global/qfeatures.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 2451668031..7abddda0c5 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -49,9 +49,6 @@
// QAction
//#define QT_NO_ACTION
-// Big Codecs
-//#define QT_NO_BIG_CODECS
-
// QClipboard
//#define QT_NO_CLIPBOARD
@@ -255,6 +252,11 @@
#define QT_NO_ANIMATION
#endif
+// Big Codecs
+#if !defined(QT_NO_BIG_CODECS) && (defined(QT_NO_TEXTCODEC))
+#define QT_NO_BIG_CODECS
+#endif
+
// QButtonGroup
#if !defined(QT_NO_BUTTONGROUP) && (defined(QT_NO_GROUPBOX))
#define QT_NO_BUTTONGROUP