diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-07 14:36:58 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-07 14:36:58 (GMT) |
| commit | 55c983e33d974d046d8deab8b68b85efdb9eb03a (patch) | |
| tree | d3832e0380eb67b34636888295c7ec53feaf55df /src | |
| parent | 86bb9a9f8b2a455d4f3f8f58bb1a0f751d68df35 (diff) | |
| parent | d401e8bdde67b6fa0523cdaeccaeb80333ab36e7 (diff) | |
| download | Qt-55c983e33d974d046d8deab8b68b85efdb9eb03a.zip Qt-55c983e33d974d046d8deab8b68b85efdb9eb03a.tar.gz Qt-55c983e33d974d046d8deab8b68b85efdb9eb03a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index d61cd6b..a099dd9 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -170,6 +170,8 @@ private: friend class QXmlStreamWriter; friend class QXmlStreamWriterPrivate; + friend class QCoreXmlStreamWriter; + friend class QCoreXmlStreamWriterPrivate; }; class Q_CORE_EXPORT QTextDecoder { |