Add a DisplayName setting for repositories.

If DisplayName is set, it will be shown instead of the URL.
This serves to hide a repositories URL while still being
able to pinpoint bugreports to a specific repository.

Task-number: QTIFW-244

Change-Id: Iaf0bc1612b42f1044da936d0fc2c4ad0e1e85d61
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/libs/installer/getrepositorymetainfojob.cpp b/src/libs/installer/getrepositorymetainfojob.cpp
index bbf3afe25..b0386c223 100644
--- a/src/libs/installer/getrepositorymetainfojob.cpp
+++ b/src/libs/installer/getrepositorymetainfojob.cpp
@@ -146,7 +146,7 @@ Repository GetRepositoryMetaInfoJob::repository() const
 void GetRepositoryMetaInfoJob::setRepository(const Repository &r)
 {
     m_repository = r;
-    qDebug() << "Setting repository with URL:" << r.url().toString();
+    qDebug() << "Setting repository with URL:" << r.displayname();
 }
 
 int GetRepositoryMetaInfoJob::silentRetries() const
@@ -307,6 +307,7 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadFinished()
                     Repository repository(el.attribute(QLatin1String("url")), true);
                     repository.setUsername(el.attribute(QLatin1String("username")));
                     repository.setPassword(el.attribute(QLatin1String("password")));
+                    repository.setDisplayName(el.attribute(QLatin1String("displayname")));
                     repositoryUpdates.insertMulti(action, qMakePair(repository, Repository()));
 
                     qDebug() << "Repository to add:" << repository.url().toString();
@@ -322,6 +323,7 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadFinished()
                     Repository newRepository(el.attribute(QLatin1String("newUrl")), true);
                     newRepository.setUsername(el.attribute(QLatin1String("username")));
                     newRepository.setPassword(el.attribute(QLatin1String("password")));
+                    newRepository.setDisplayName(el.attribute(QLatin1String("displayname")));
 
                     // store the new repository and the one old it replaces
                     repositoryUpdates.insertMulti(action, qMakePair(newRepository, oldRepository));
@@ -524,7 +526,7 @@ void GetRepositoryMetaInfoJob::unzipFinished(bool ok, const QString &error)
 }
 
 bool GetRepositoryMetaInfoJob::updateRepositories(QSet<Repository> *repositories, const QString &username,
-    const QString &password)
+    const QString &password, const QString &displayname)
 {
     if (!repositories->contains(m_repository))
         return false;
@@ -532,6 +534,7 @@ bool GetRepositoryMetaInfoJob::updateRepositories(QSet<Repository> *repositories
     repositories->remove(m_repository);
     m_repository.setUsername(username);
     m_repository.setPassword(password);
+    m_repository.setDisplayName(displayname);
     repositories->insert(m_repository);
     return true;
 }