diff options
| -rw-r--r-- | src/corelib/mimetypes/qmimeprovider.cpp | 10 | ||||
| -rw-r--r-- | src/sql/configure.json | 1 |
2 files changed, 6 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); } } } diff --git a/src/sql/configure.json b/src/sql/configure.json index 5476d419ed..96c82e84f9 100644 --- a/src/sql/configure.json +++ b/src/sql/configure.json @@ -69,6 +69,7 @@ "label": "PostgreSQL", "test": "unix/psql", "sources": [ + { "type": "pkgConfig", "args": "libpq" }, { "type": "psqlConfig" }, { "type": "psqlEnv", "libs": "-llibpq -lws2_32 -ladvapi32", "condition": "config.win32" }, { "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" } |