diff -r 41300fa6a67c -r f7bc934e204c src/corelib/codecs/qtextcodec.h
--- a/src/corelib/codecs/qtextcodec.h	Tue Feb 02 00:43:10 2010 +0200
+++ b/src/corelib/codecs/qtextcodec.h	Wed Mar 31 11:06:36 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -167,6 +167,13 @@
 private:
     const QTextCodec *c;
     QTextCodec::ConverterState state;
+
+    friend class QXmlStreamWriter;
+    friend class QXmlStreamWriterPrivate;
+#if defined(Q_OS_MAC32) || defined(Q_OS_AIX)
+    friend class QCoreXmlStreamWriter;
+    friend class QCoreXmlStreamWriterPrivate;
+#endif
 };
 
 class Q_CORE_EXPORT QTextDecoder {