Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: I3b51bb706e401edfda09a433c67aa58e44f33e83

1 files changed, 5 insertions, 5 deletions

diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp
index a798d9eff6..e9996c204d 100644
--- a/src/corelib/mimetypes/qmimeprovider.cpp
+++ b/src/corelib/mimetypes/qmimeprovider.cpp
@@ -536,11 +536,11 @@ void QMimeBinaryProvider::loadMimeTypeList()
         for (const QString &typeFilename : typesFilenames) {
             QFile file(typeFilename);
             if (file.open(QIODevice::ReadOnly)) {
-                while (!file.atEnd()) {
-                    QByteArray line = file.readLine();
-                    line.chop(1);
-                    m_mimetypeNames.insert(QString::fromLatin1(line.constData(), line.size()));
-                }
+                QTextStream stream(&file);
+                stream.setCodec("ISO 8859-1");
+                QString line;
+                while (stream.readLineInto(&line))
+                    m_mimetypeNames.insert(line);
             }
         }
     }