diff options
author | Niels Weber <niels.weber@digia.com> | 2013-03-19 14:41:17 +0100 |
---|---|---|
committer | Niels Weber <niels.weber@digia.com> | 2013-03-21 13:32:31 +0100 |
commit | 44fc5acd5c44da29306558ef5a081afb0ea92304 (patch) | |
tree | 40a24e8fad5bcc3ed8968f214263de1bb8947673 /tools/binarycreator/binarycreator.cpp | |
parent | 5eaf779bfa35eb9dd825a802550263af666d58e9 (diff) |
Deprecate Icon, introduce replacements.
InstallerApplicationIcon is used on Mac and Windows
for a custom icon of the installer.
InstallerWindowIcon is used to set the window icon
of the installer on all platforms.
Change-Id: I1f555441875b96e4d8e4ca9a808cf18b3a566c3c
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'tools/binarycreator/binarycreator.cpp')
-rw-r--r-- | tools/binarycreator/binarycreator.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index a6a38a9da..433b9832c 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -154,8 +154,13 @@ Q_UNUSED(settings) pkgInfoStream << QLatin1String("APPL????") << endl; } - const QString iconFile = QFile::exists(settings.icon()) ? settings.icon() - : QString::fromLatin1(":/resources/default_icon_mac.icns"); + if (QFile::exists(settings.installerApplicationIcon())) { + const QString iconFile = settings.installerApplicationIcon(); + } else { + const QString iconFile = QFile::exists(settings.icon()) ? settings.icon() + : QString::fromLatin1(":/resources/default_icon_mac.icns"); + } + const QString iconTargetFile = fi.completeBaseName() + QLatin1String(".icns"); QFile::copy(iconFile, fi.filePath() + QLatin1String("/Contents/Resources/") + iconTargetFile); @@ -218,9 +223,13 @@ Q_UNUSED(settings) #if defined(Q_OS_WIN) // setting the windows icon must happen before we append our binary data - otherwise they get lost :-/ - if (QFile::exists(settings.icon())) { + if (QFile::exists(settings.installerApplicationIcon())) { // no error handling as this is not fatal - setApplicationIcon(tempFile, settings.icon()); + setApplicationIcon(tempFile, settings.installerApplicationIcon()); + } else { + if (QFile::exists(settings.icon())) { + setApplicationIcon(tempFile, settings.icon()); + } } #elif defined(Q_OS_MAC) if (isBundle) { |