summaryrefslogtreecommitdiffstats
path: root/src/corelib/codecs/qtextcodec.h
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-18 12:49:13 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-18 12:49:13 (GMT)
commit5c247a8afb51ff58c4f0ef7f26c2e22d4700cd39 (patch)
tree1845c5fd4bc6b9bc0b18b1f793a13d11870cd12d /src/corelib/codecs/qtextcodec.h
parent85628b1798ec4c98333c8f4529f5d5628f3f1bbb (diff)
parenteeb121d54e345e92ab74d8c43e07d803a0e144ea (diff)
downloadQt-5c247a8afb51ff58c4f0ef7f26c2e22d4700cd39.zip
Qt-5c247a8afb51ff58c4f0ef7f26c2e22d4700cd39.tar.gz
Qt-5c247a8afb51ff58c4f0ef7f26c2e22d4700cd39.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/corelib/codecs/qtextcodec.h')
-rw-r--r--src/corelib/codecs/qtextcodec.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h
index 5012b42..e37527d 100644
--- a/src/corelib/codecs/qtextcodec.h
+++ b/src/corelib/codecs/qtextcodec.h
@@ -171,11 +171,6 @@ public:
private:
const QTextCodec *c;
QTextCodec::ConverterState state;
-
- friend class QXmlStreamWriter;
- friend class QXmlStreamWriterPrivate;
- friend class QCoreXmlStreamWriter;
- friend class QCoreXmlStreamWriterPrivate;
};
class Q_CORE_EXPORT QTextDecoder {