Temporary hackiesh solution to prevent BOM in the xml data.

We don't want to have byte-order-mark in the middle of the written string.

Task-number: QTBUG-6893
Reviewed-by: Thiago

2 files changed, 5 insertions, 2 deletions

diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h
index 75aafdd..d61cd6b 100644
--- a/src/corelib/codecs/qtextcodec.h
+++ b/src/corelib/codecs/qtextcodec.h
@@ -167,6 +167,9 @@ public:
 private:
     const QTextCodec *c;
     QTextCodec::ConverterState state;
+
+    friend class QXmlStreamWriter;
+    friend class QXmlStreamWriterPrivate;
 };
 
 class Q_CORE_EXPORT QTextDecoder {
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index 9f8867f..f987a31 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -3006,7 +3006,7 @@ QXmlStreamWriterPrivate::QXmlStreamWriterPrivate(QXmlStreamWriter *q)
 #ifndef QT_NO_TEXTCODEC
     codec = QTextCodec::codecForMib(106); // utf8
     encoder = codec->makeEncoder();
-    encoder->fromUnicode(QLatin1String("")); // no byte order mark for utf8
+    encoder->state.flags |= QTextCodec::IgnoreHeader; // no byte order mark for utf8
 #endif
     inStartElement = inEmptyElement = false;
     wroteSomething = false;
@@ -3282,7 +3282,7 @@ void QXmlStreamWriter::setCodec(QTextCodec *codec)
         delete d->encoder;
         d->encoder = codec->makeEncoder();
         if (codec->mibEnum() == 106)
-            d->encoder->fromUnicode(QLatin1String("")); // no byte order mark for utf8
+            d->encoder->state.flags |= QTextCodec::IgnoreHeader; // no byte order mark for utf8
     }
 }