diff options
author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-01-13 14:04:17 +0200 |
---|---|---|
committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-01-13 14:04:17 +0200 |
commit | 5bad4f817d94dcf45840a171cd3c5a27f9b23fae (patch) | |
tree | 140a2a504fd4ed5d415b66711e4e27baa6fb6ecb /src/libs | |
parent | 3d9e810ff434206b6eb9c84d7e1aac7ffee24c88 (diff) | |
parent | 0fbcb0a1cbe4662c929ecbfc5d1c7328d06eb684 (diff) |
Merge remote-tracking branch 'origin/4.0'
Change-Id: Ifb02b022312859c2c946ec0debcd77dc90a0ced2
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/ifwtools/binarycreator.cpp | 2 | ||||
-rw-r--r-- | src/libs/installer/component.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/ifwtools/binarycreator.cpp b/src/libs/ifwtools/binarycreator.cpp index cf04355de..95ff93393 100644 --- a/src/libs/ifwtools/binarycreator.cpp +++ b/src/libs/ifwtools/binarycreator.cpp @@ -629,7 +629,7 @@ void QInstallerTools::copyConfigData(const QString &configFile, const QString &t QString targetFile; QFileInfo elementFileInfo; - if (tagName == QLatin1String("Icon") || tagName == QLatin1String("InstallerApplicationIcon")) { + if (tagName == QLatin1String("InstallerApplicationIcon")) { #if defined(Q_OS_MACOS) const QString suffix = QLatin1String(".icns"); #elif defined(Q_OS_WIN) diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 1f5ad012f..d4750cee9 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -727,7 +727,7 @@ void Component::loadLicenses(const QString &directory, const QHash<QString, QVar break; QList<QFileInfo> fileCandidates; - foreach (const QString &locale, QInstaller::localeCandidates(lang.toLower())) { + foreach (const QString &locale, QInstaller::localeCandidates(lang)) { fileCandidates << QFileInfo(QString::fromLatin1("%1%2_%3.%4").arg( directory, fileInfo.baseName(), locale, fileInfo.completeSuffix())); |