Skip to content

Commit 38c2882

Browse files
committed
Added UninstallerComments option to config
1 parent 5aa2604 commit 38c2882

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

src/libs/installer/constants.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ static const QLatin1String scProductUUID("ProductUUID");
9090
static const QLatin1String scAllUsers("AllUsers");
9191
static const QLatin1String scSupportsModify("SupportsModify");
9292
static const QLatin1String scChinaInstaller("ChinaInstaller");
93+
static const QLatin1String scUninstallerComments("UninstallerComments");
9394
static const QLatin1String scAllowUnstableComponents("AllowUnstableComponents");
9495
static const QLatin1String scSaveDefaultRepositories("SaveDefaultRepositories");
9596
static const QLatin1String scRepositoryCategoryDisplayName("RepositoryCategoryDisplayName");

src/libs/installer/packagemanagercore_p.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2052,7 +2052,11 @@ void PackageManagerCorePrivate::registerMaintenanceTool()
20522052
settings.setValue(QLatin1String("DisplayIcon"), maintenanceTool);
20532053
settings.setValue(scPublisher, m_data.value(scPublisher));
20542054
settings.setValue(QLatin1String("UrlInfoAbout"), m_data.value(QLatin1String("Url")));
2055-
// settings.setValue(QLatin1String("Comments"), m_data.value(scTitle));
2055+
QString comments = m_data.value(scUninstallerComments).toString();
2056+
if (!comments.isEmpty())
2057+
{
2058+
settings.setValue(QLatin1String("Comments"), comments);
2059+
}
20562060
settings.setValue(QLatin1String("InstallDate"), QDateTime::currentDateTime().toString());
20572061
settings.setValue(QLatin1String("InstallLocation"), QDir::toNativeSeparators(targetDir()));
20582062
settings.setValue(QLatin1String("UninstallString"), maintenanceTool);

src/libs/installer/settings.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix,
290290
<< scWizardStyle << scStyleSheet << scTitleColor
291291
<< scWizardDefaultWidth << scWizardDefaultHeight
292292
<< scRepositorySettingsPageVisible << scTargetConfigurationFile
293-
<< scRemoteRepositories << scTranslations << scChinaInstaller << scUrlQueryString << QLatin1String(scControlScript)
293+
<< scRemoteRepositories << scTranslations << scUrlQueryString << QLatin1String(scControlScript)
294+
<< scChinaInstaller << scUninstallerComments
294295
<< scCreateLocalRepository << scInstallActionColumnVisible << scSupportsModify << scAllowUnstableComponents
295296
<< scSaveDefaultRepositories << scRepositoryCategories;
296297

@@ -843,6 +844,11 @@ bool Settings::isChinaInstaller() const
843844
return d->m_data.value(scChinaInstaller, false).toBool();
844845
}
845846

847+
QString Settings::uninstallerComments() const
848+
{
849+
return d->m_data.value(scUninstallerComments).toString();
850+
}
851+
846852
bool Settings::supportsModify() const
847853
{
848854
return d->m_data.value(scSupportsModify, true).toBool();

src/libs/installer/settings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ class INSTALLER_EXPORT Settings
161161

162162
bool supportsModify() const;
163163
bool isChinaInstaller() const;
164+
QString uninstallerComments() const;
164165

165166
bool allowUnstableComponents() const;
166167
void setAllowUnstableComponents(bool allow);

0 commit comments

Comments
 (0)