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 From 245c9ea575625f26736842da8a81ccd220ac8f70 Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Wed, 9 Dec 2020 10:41:21 +0200 Subject: Doc: Mark as Linux and Windows only element Task-number: QTIFW-2077 Change-Id: I0298f2a3ec2eeb74536d27c172b9e84527bddf80 Reviewed-by: Katja Marttila --- doc/installerfw.qdoc | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index 8587027ea..0ae3cba04 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -383,6 +383,7 @@ \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. -- cgit v1.2.3 From b903655ebc7af0055e3df6d2fc3268809c6d974f Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Tue, 1 Dec 2020 14:45:10 +0200 Subject: Open the top treeview item after pressing 'Filter' Topmost treeview item should be open by default, but this was not the case after categories were fetched. Task-number: QTIFW-2058 Change-Id: If64126623bd7b783524b8bd16771ede574be3b97 Reviewed-by: Iikka Eklund Reviewed-by: Arttu Tarkiainen --- src/libs/installer/componentselectionpage_p.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/installer/componentselectionpage_p.cpp b/src/libs/installer/componentselectionpage_p.cpp index c5117e9cb..6d3300081 100644 --- a/src/libs/installer/componentselectionpage_p.cpp +++ b/src/libs/installer/componentselectionpage_p.cpp @@ -415,6 +415,7 @@ void ComponentSelectionPagePrivate::fetchRepositoryCategories() QLatin1String("FailToFetchPackages"), tr("Error"), m_core->error()); } updateWidgetVisibility(false); + updateTreeView(); } void ComponentSelectionPagePrivate::customButtonClicked(int which) -- cgit v1.2.3 From 1f1b46c2046736c945a87ea1f37afa419675d7c7 Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Fri, 11 Dec 2020 10:17:07 +0200 Subject: Doc: Note the unique name requirement for files referred in config.xml Task-number: QTIFW-2077 Change-Id: Ie5a21cb73dc41135e20e5059644d22c31275b49d Reviewed-by: Leena Miettinen Reviewed-by: Katja Marttila --- doc/installerfw.qdoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index 0ae3cba04..014f690c2 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -350,6 +350,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 and \c , 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}. -- cgit v1.2.3 From a00146cbcf207b97bf2bbba7544290293f6d167e Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Mon, 11 Jan 2021 09:03:13 +0100 Subject: Don't call toLower() when using the lang for finding the license file By calling toLower() it will go against what the expected format is for a language such as zh-CN and as a result not find the license file which is matching this language. Change-Id: Ibdf7d57d3d2761db7b68edcabf5599b9404f3b7e Reviewed-by: Katja Marttila --- src/libs/installer/component.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 16b417b02..5c74a2139 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -661,7 +661,7 @@ void Component::loadLicenses(const QString &directory, const QHash 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())); -- cgit v1.2.3 From a8463e5b16798a003c7cbe79ab2cf2671ff9e81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 5 Jan 2021 09:20:15 +0100 Subject: Embed target language in translation files Fixes lupdate warning ifw_es.ts won't be updated: it contains translation but the target language is not recognized Change-Id: I46973c9583bc9220381780b807b672baba05567d Reviewed-by: Oswald Buddenhagen Reviewed-by: Katja Marttila --- src/sdk/translations/ifw_es.ts | 2 +- src/sdk/translations/ifw_fr.ts | 2 +- src/sdk/translations/ifw_it.ts | 2 +- src/sdk/translations/ifw_ja.ts | 2 +- src/sdk/translations/ifw_pl.ts | 2 +- src/sdk/translations/ifw_zh_CN.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sdk/translations/ifw_es.ts b/src/sdk/translations/ifw_es.ts index 760adaf98..bb18e856f 100644 --- a/src/sdk/translations/ifw_es.ts +++ b/src/sdk/translations/ifw_es.ts @@ -1,6 +1,6 @@ - + AuthenticationRequiredException diff --git a/src/sdk/translations/ifw_fr.ts b/src/sdk/translations/ifw_fr.ts index 504d0f37e..b45888e6b 100644 --- a/src/sdk/translations/ifw_fr.ts +++ b/src/sdk/translations/ifw_fr.ts @@ -1,6 +1,6 @@ - + AuthenticationRequiredException diff --git a/src/sdk/translations/ifw_it.ts b/src/sdk/translations/ifw_it.ts index 5be3c8218..a9fc6835b 100644 --- a/src/sdk/translations/ifw_it.ts +++ b/src/sdk/translations/ifw_it.ts @@ -1,6 +1,6 @@ - + AuthenticationRequiredException diff --git a/src/sdk/translations/ifw_ja.ts b/src/sdk/translations/ifw_ja.ts index 47d865520..2e6573d14 100644 --- a/src/sdk/translations/ifw_ja.ts +++ b/src/sdk/translations/ifw_ja.ts @@ -1,6 +1,6 @@ - + AuthenticationRequiredException diff --git a/src/sdk/translations/ifw_pl.ts b/src/sdk/translations/ifw_pl.ts index b557bfdce..43b5232e9 100644 --- a/src/sdk/translations/ifw_pl.ts +++ b/src/sdk/translations/ifw_pl.ts @@ -1,6 +1,6 @@ - + AuthenticationRequiredException diff --git a/src/sdk/translations/ifw_zh_CN.ts b/src/sdk/translations/ifw_zh_CN.ts index 363a46fd2..8d250bd21 100644 --- a/src/sdk/translations/ifw_zh_CN.ts +++ b/src/sdk/translations/ifw_zh_CN.ts @@ -1,6 +1,6 @@ - + AuthenticationRequiredException -- cgit v1.2.3 From 0fbcb0a1cbe4662c929ecbfc5d1c7328d06eb684 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Mon, 25 Jan 2021 13:15:34 +0200 Subject: Remove IFW tools signing Signing installerbase will prevent the installer generated with binarycreator to be signed. (error 0x800700C1) Change-Id: I3b27a92c8e943fe0ea1242537961498597e4d93d Reviewed-by: Antti Kokko Reviewed-by: Arttu Tarkiainen --- coin/instructions/make_instructions.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/coin/instructions/make_instructions.yaml b/coin/instructions/make_instructions.yaml index 4a4eb2281..6618d7ef2 100644 --- a/coin/instructions/make_instructions.yaml +++ b/coin/instructions/make_instructions.yaml @@ -61,15 +61,6 @@ instructions: property: target.compiler in_values: [MSVC2013, MSVC2015, MSVC2017, MSVC2019] - - type: SignPackage - directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}" - maxTimeInSeconds: 1200 - maxTimeBetweenOutput: 1200 - enable_if: - condition: property - property: host.os - equals_value: Windows - - type: UploadArtifact archiveDirectory: "{{.InstallRoot}}/{{.AgentWorkingDir}}" transferType: UploadModuleBuildArtifact -- cgit v1.2.3