Merge remote-tracking branch 'origin/2.0'

Conflicts:
	doc/installerfw.qdoc

Change-Id: I3d991775eae96c7de689e4b92393065564940a5f

1 files changed, 10 insertions, 2 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;
         }
     };