diff options
| author | Niels Weber <niels.weber@digia.com> | 2014-11-14 13:04:06 +0100 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2014-11-14 14:24:08 +0100 |
| commit | ddb068f7c38914d4de3ca810a01c2bc5a6da3660 (patch) | |
| tree | 743a194c44d6f8c0dc4d56068db6349ed3275f32 /tools | |
| parent | b7f7c2784a3908a315e1e9d5025d027951ce549f (diff) | |
Fix compilation on OSX and Windows
Change-Id: I2981cdebda3fba7d69269ae6b1a1ae7999162fa6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binarycreator/binarycreator.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index 6ef009cf4..cee78c348 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -145,8 +145,7 @@ static int assemble(Input input, const QInstaller::Settings &settings) if (QFile::exists(settings.installerApplicationIcon())) { iconFile = settings.installerApplicationIcon(); } else { - iconFile = QFile::exists(settings.icon()) ? settings.icon() - : QString::fromLatin1(":/resources/default_icon_mac.icns"); + iconFile = QString::fromLatin1(":/resources/default_icon_mac.icns"); } const QString iconTargetFile = fi.completeBaseName() + QLatin1String(".icns"); @@ -225,10 +224,6 @@ static int assemble(Input input, const QInstaller::Settings &settings) if (QFile::exists(settings.installerApplicationIcon())) { // no error handling as this is not fatal setApplicationIcon(tempFile, settings.installerApplicationIcon()); - } else { - if (QFile::exists(settings.icon())) { - setApplicationIcon(tempFile, settings.icon()); - } } #elif defined(Q_OS_OSX) if (isBundle) { |