Merge remote-tracking branch 'origin/2.0'

Conflicts:
	doc/installerfw.qdoc

Change-Id: I3d991775eae96c7de689e4b92393065564940a5f

3 files changed, 13 insertions, 3 deletions

diff --git a/src/libs/installer/component.h b/src/libs/installer/component.h
index 395bf90dd..0d2f0dde3 100644
--- a/src/libs/installer/component.h
+++ b/src/libs/installer/component.h
@@ -76,7 +76,11 @@ public:
     {
         bool operator() (const Component *lhs, const Component *rhs) const
         {
-            return lhs->value(scSortingPriority).toInt() < rhs->value(scSortingPriority).toInt();
+            const int lhsPriority = lhs->value(scSortingPriority).toInt();
+            const int rhsPriority = rhs->value(scSortingPriority).toInt();
+            if (lhsPriority == rhsPriority)
+                return lhs->displayName() > rhs->displayName();
+            return lhsPriority < rhsPriority;
         }
     };
 
@@ -84,7 +88,11 @@ public:
     {
         bool operator() (const Component *lhs, const Component *rhs) const
         {
-            return lhs->value(scSortingPriority).toInt() > rhs->value(scSortingPriority).toInt();
+            const int lhsPriority = lhs->value(scSortingPriority).toInt();
+            const int rhsPriority = rhs->value(scSortingPriority).toInt();
+            if (lhsPriority == rhsPriority)
+                return lhs->displayName() < rhs->displayName();
+            return lhsPriority > rhsPriority;
         }
     };
 
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()));
 
diff --git a/src/libs/installer/remoteobject.h b/src/libs/installer/remoteobject.h
index 72c20eaa4..deac75776 100644
--- a/src/libs/installer/remoteobject.h
+++ b/src/libs/installer/remoteobject.h
@@ -91,6 +91,8 @@ public:
     T callRemoteMethod(const QString &name, const T1 &arg, const T2 &arg2, const T3 &arg3) const
     {
         writeData(name, arg, arg2, arg3);
+        while (m_socket->bytesToWrite())
+            m_socket->waitForBytesWritten();
 
         QByteArray command;
         QByteArray data;