Merge remote-tracking branch 'origin/4.0'

Change-Id: Ifb02b022312859c2c946ec0debcd77dc90a0ced2

3 files changed, 8 insertions, 9 deletions

diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index 043789722..8ef06738f 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -361,6 +361,10 @@
     relative paths, which the tools resolve relative to the location of
     the config.xml file.
 
+    \note The filenames of the referred files must be unique. That is, if you
+    want to use the same image for both \c <Logo> and \c <Watermark>, you
+    must add two copies of the image file with different filenames.
+
     You can use predefined variables (embedded in @ characters) as values of the
     elements. For more information, see \l{Predefined Variables}.
 
@@ -388,18 +392,13 @@
             \li URL to a page that contains product information on your web
                 site.
         \row
-            \li Icon
-            \li Filename for a custom installer icon. The actual file is looked up by attaching
-                a '.icns' (macOS), '.ico' (Windows) or '.png' (Unix) suffix. Deprecated,
-                use \c <InstallerApplicationIcon> or \c <InstallerWindowIcon>
-                instead.
-        \row
             \li InstallerApplicationIcon
             \li Filename for a custom installer icon. The actual file is looked up by attaching
-                a '.icns' (macOS), '.ico' (Windows). No functionality on Unix.
+                a '.icns' (macOS), '.ico' (Windows) suffix. No functionality on Unix.
         \row
             \li InstallerWindowIcon
             \li Filename for a custom window icon in PNG format for the Installer application.
+                Used on Windows and Linux, no functionality on macOS.
         \row
             \li Logo
             \li Filename for a logo used as \c QWizard::LogoPixmap.
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()));