summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <aportale@trolltech.com>2009-08-14 13:52:21 (GMT)
committerAlessandro Portale <aportale@trolltech.com>2009-08-14 13:52:21 (GMT)
commit6227fe674924939c7baeb4a5a1e53090bb4c10a6 (patch)
treebc8fcc73a8b51e4abb1fc1e5dcad64c5c51f104b
parent84003f563516e2c5c38440c8bdd63e21d7992aa9 (diff)
parent982a43f68c3ed691b9d96e2937c05dfa4634207b (diff)
downloadQt-6227fe674924939c7baeb4a5a1e53090bb4c10a6.zip
Qt-6227fe674924939c7baeb4a5a1e53090bb4c10a6.tar.gz
Qt-6227fe674924939c7baeb4a5a1e53090bb4c10a6.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
-rw-r--r--src/corelib/codecs/qtextcodec.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index adfe2ed..4915c39 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -92,10 +92,8 @@
# define QT_NO_SETLOCALE
#endif
-#if 0 // ### TODO - remove me!
// enabling this is not exception safe!
-#define Q_DEBUG_TEXTCODEC
-#endif
+// #define Q_DEBUG_TEXTCODEC
QT_BEGIN_NAMESPACE