From c8f03f22b8a29e1b176fa1cd4f494df2bbd3b1b0 Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Wed, 9 Dec 2020 10:01:02 +0200 Subject: Remove references to element The element is marked as deprecated and does not work correctly anymore so mentions should be removed from documentation and code accordingly. Replaced with and . Task-number: QTIFW-2076 Change-Id: I33c60321e468852b6ae20b44ed72a3e7a2119b75 Reviewed-by: Katja Marttila --- doc/installerfw.qdoc | 8 +------- tools/binarycreator/binarycreator.cpp | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index 197b3ea43..8587027ea 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -376,16 +376,10 @@ \li ProductUrl \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 or \c - 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. diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index f6662615e..488a70e68 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -732,7 +732,7 @@ void copyConfigData(const QString &configFile, const QString &targetDir) 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) -- cgit v1.2.3