diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-01-03 12:30:16 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@theqtcompany.com> | 2017-01-03 12:36:27 +0200 |
| commit | b4144d80976c1af3c68b8f78dec635146f3c6981 (patch) | |
| tree | 8d517e2ec21b2a5ab8ff182773c16f33a83f206e /src/libs/installer/metadatajob.cpp | |
| parent | 6543837af1ffb209859b4ebab85e31b17ad18df7 (diff) | |
| parent | 52a1a20ccd283abcce0c1e78838e3ce2dddb4de6 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
doc/installerfw.qdoc
Change-Id: I3d991775eae96c7de689e4b92393065564940a5f
Diffstat (limited to 'src/libs/installer/metadatajob.cpp')
| -rw-r--r-- | src/libs/installer/metadatajob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp index b3301c761..9c9ef6246 100644 --- a/src/libs/installer/metadatajob.cpp +++ b/src/libs/installer/metadatajob.cpp @@ -500,7 +500,7 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re } } else if (action == QLatin1String("remove")) { // remove possible default repositories using the given server url - Repository repository(el.attribute(QLatin1String("url")), true); + Repository repository(resolveUrl(result, el.attribute(QLatin1String("url"))), true); repository.setDisplayName(el.attribute(QLatin1String("displayname"))); repositoryUpdates.insertMulti(action, qMakePair(repository, Repository())); |