diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2024-03-12 07:56:00 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2024-03-13 08:07:06 +0200 |
| commit | f7f14309fe27faad080e31b77e72dadd32c9b6e0 (patch) | |
| tree | 691a8abfb859cd235b9265382015c755a347814f /src | |
| parent | 85eb35bdcc702dec04f32f5ddb833de989918226 (diff) | |
Add security warning possibility when using additional repositories
When installing from CLI and the installable component is not in default
categories, developer has possibility to override ProductkeyCheck and
return custom security message warning.
Task-number: QTIFW-3305
Change-Id: Ie321af6796bf19c910216be2c6ee521aa63788d8
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 3 | ||||
| -rw-r--r-- | src/libs/installer/productkeycheck.cpp | 4 | ||||
| -rw-r--r-- | src/libs/installer/productkeycheck.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 01366d559..eb344ce16 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1679,6 +1679,9 @@ bool PackageManagerCore::fetchPackagesWithFallbackRepositories(const QStringList qCDebug(QInstaller::lcInstallerInstallLog).noquote() << "Components not found for installation with the current selection." << "Searching from additional repositories"; + if (!ProductKeyCheck::instance()->securityWarning().isEmpty()) { + qCWarning(QInstaller::lcInstallerInstallLog) << ProductKeyCheck::instance()->securityWarning(); + } if (!checkComponents()) { return false; } diff --git a/src/libs/installer/productkeycheck.cpp b/src/libs/installer/productkeycheck.cpp index 576acfde8..61309fc51 100644 --- a/src/libs/installer/productkeycheck.cpp +++ b/src/libs/installer/productkeycheck.cpp @@ -124,3 +124,7 @@ QString ProductKeyCheck::licenseAcceptanceText() const { return QString(); } +QString ProductKeyCheck::securityWarning() const +{ + return QString(); +} diff --git a/src/libs/installer/productkeycheck.h b/src/libs/installer/productkeycheck.h index 766eee6e9..d2b11708f 100644 --- a/src/libs/installer/productkeycheck.h +++ b/src/libs/installer/productkeycheck.h @@ -72,6 +72,7 @@ public: bool hasValidLicense() const; bool hasAcceptedAllLicenses() const; QString licenseAcceptanceText() const; + QString securityWarning() const; private: ProductKeyCheck(); |