diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-18 15:48:32 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-18 15:48:32 (GMT) |
| commit | 4baa9dfb5273d7b501dcb3f456983262c53cc8d1 (patch) | |
| tree | af04bea96067fcb8c282067aea00703a25b52069 /src/corelib/codecs | |
| parent | 9eacc56619ce471a9777f88c89f64ca95cd6ae63 (diff) | |
| parent | c18beac8163634b48bbf1e7280923e96f5ef0a51 (diff) | |
| download | Qt-4baa9dfb5273d7b501dcb3f456983262c53cc8d1.zip Qt-4baa9dfb5273d7b501dcb3f456983262c53cc8d1.tar.gz Qt-4baa9dfb5273d7b501dcb3f456983262c53cc8d1.tar.bz2 | |
Merge remote branch 'origin/master' into qt-master-from-4.6
Conflicts:
src/corelib/codecs/qtextcodec.h
tests/auto/gestures/tst_gestures.cpp
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index e00d7b4..4e85bf5 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -171,12 +171,7 @@ public: private: const QTextCodec *c; QTextCodec::ConverterState state; - - friend class QXmlStreamWriter; - friend class QXmlStreamWriterPrivate; #if defined Q_XMLSTREAM_RENAME_SYMBOLS - friend class QCoreXmlStreamWriter; - friend class QCoreXmlStreamWriterPrivate; #endif }; |