Merge remote-tracking branch 'origin/2.0'

Change-Id: Ibd01bc156481df973e3c9371d77af338a5e82607

3 files changed, 13 insertions, 3 deletions

diff --git a/Changelog b/Changelog
index 1e941caa7..3d38199b6 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,14 @@
 2.1.0
 
+2.0.4
+- Set also display name for Repository action "remove"
+- Adjusted wrong repogen parameter name
+- Fix settings test
+- Make Execute operation work without arguments in Windows
+- Add make install functionality with INSTALL_ROOT
+- Do not force doc build on Linux when calling "make install"
+- Documentation updates
+
 2.0.3
 - Update Japanese translation.
 - Make IFW compile with FreeBSD. (QTIFW-841)
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index c8a094453..d543c040b 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -930,8 +930,8 @@
             \li Update all packages in the packages directory. The list can be further
                 filtered with the \c {-i}, \c {-e} parameters.
         \row
-            \li --update-new-packages
-            \li Update only packages that are new or have a newer version. The
+            \li --update-new-components
+            \li Update only components that are new or have a newer version. The
                 list can be further filtered with the \c {-i}, \c{-e}
                 parameters.
         \row
diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 58b1ede8e..b010209c3 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -397,7 +397,8 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
                     }
                 } else if (action == QLatin1String("remove")) {
                     // remove possible default repositories using the given server url
-                    Repository repository(resolveUrl(result, el.attribute(QLatin1String("url"))), true);
+                    Repository repository(el.attribute(QLatin1String("url")), true);
+                    repository.setDisplayName(el.attribute(QLatin1String("displayname")));
                     repositoryUpdates.insertMulti(action, qMakePair(repository, Repository()));
 
                     qDebug() << "Repository to remove:" << repository.displayname();