diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-02 01:00:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-02 01:00:10 +0100 |
| commit | 6cf3428a43c5744096db0c849aa975c4cb06bd31 (patch) | |
| tree | f7961a992461793ea40781516903c5dd629fe1e5 /src/corelib | |
| parent | 529cb7217c0162c31ef6f309730e93612b9798d3 (diff) | |
| parent | b3e91b66b9175c1c3ff5f73f3ac231f74f9bf932 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I42ec9e6aafc203465cbeb88af70c7af26b7df8ed
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/configure.json | 1 | ||||
| -rw-r--r-- | src/corelib/mimetypes/qmimeprovider.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 92b2b0b1ad..7c3b513b0b 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -176,6 +176,7 @@ ] }, "sources": [ + { "type": "pkgConfig", "args": "libpcre2-16" }, "-lpcre2-16" ] }, diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index ec0a6bf0ef..90a16886a9 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -401,7 +401,7 @@ QString QMimeBinaryProvider::resolveAlias(const QString &name) return QLatin1String(mimeType); } } - return name; + return QString(); } void QMimeBinaryProvider::addAliases(const QString &name, QStringList &result) @@ -729,7 +729,7 @@ void QMimeXMLProvider::addAliases(const QString &name, QStringList &result) QString QMimeXMLProvider::resolveAlias(const QString &name) { - return m_aliases.value(name, name); + return m_aliases.value(name); } void QMimeXMLProvider::addAlias(const QString &alias, const QString &name) |