diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-05-27 11:35:27 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-05-27 11:45:32 +0300 |
| commit | 3946e2f8607282e054a76b119f1819b2535a0b8a (patch) | |
| tree | f74144f8c5a1c4889bf81c89622567f564571fc8 /src/libs/installer/settings.cpp | |
| parent | 8c448f77a00d01e24e4d083d9684c275b3efdd04 (diff) | |
| parent | 6ea22a1a9ef9d9be25e09740aa72bb0a5dfebfc7 (diff) | |
Merge remote-tracking branch 'origin/3.1' into master
Change-Id: I65e3ed3858cda954a5f916031d4ff02a39a9aa87
Diffstat (limited to 'src/libs/installer/settings.cpp')
| -rw-r--r-- | src/libs/installer/settings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 13eb2ce40..e0c9a3970 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -168,7 +168,7 @@ static QSet<Repository> readRepositories(QXmlStreamReader &reader, bool isDefaul } } if (displayName && !displayName->isEmpty()) - repo.setArchiveName(*displayName); + repo.setCategoryName(*displayName); set.insert(repo); } else if (reader.name() == QLatin1String("Tooltip")) { *tooltip = reader.readElementText(); @@ -832,7 +832,7 @@ void Settings::setSaveDefaultRepositories(bool save) QString Settings::repositoryCategoryDisplayName() const { QString displayName = d->m_data.value(QLatin1String(scRepositoryCategoryDisplayName)).toString(); - return displayName.isEmpty() ? tr("Show package categories") : displayName; + return displayName.isEmpty() ? tr("Select Package Categories") : displayName; } void Settings::setRepositoryCategoryDisplayName(const QString& name) |