remove BOMs if QTextCodec::ConverterState has QTextCodec::IgnoreHeader flag set

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/codecs/qicucodec.cpp b/src/core/codecs/qicucodec.cpp
index 100ffcb..88abc4d 100644 (file)
--- a/src/core/codecs/qicucodec.cpp
+++ b/src/core/codecs/qicucodec.cpp
@@ -983,6 +983,14 @@ QString QIcuCodec::convertToUnicode(const char *src, int length,
         }
     } else {
         result.resize(convresult);
+        if (state && state->flags & QTextCodec::IgnoreHeader) {
+            // ICU always generates BOMs so no checks
+            if (ucnv_compareNames(m_name.constData(), "UTF-32")) {
+                result.remove(0, 4);
+            } else if (ucnv_compareNames(m_name.constData(), "UTF-16")) {
+                result.remove(0, 2);
+            }
+        }
     }
 
     if (!state)