From 7cfc18276f039d70ab3a342b5037e4fde21515df Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Wed, 6 Mar 2019 09:54:02 +0100
Subject: [PATCH] ProjectExplorer: Fix Kit::setup()

This function traversed the kit aspects in the wrong order, presumably
based on outdated assumptions.

Change-Id: I1cbb9ed74b9ef165f410b88cac3f1ca9983d1647
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/projectexplorer/kit.cpp        | 8 +++-----
 src/plugins/projectexplorer/kitmanager.cpp | 4 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp
index e0f3939bf35..5376f0c7661 100644
--- a/src/plugins/projectexplorer/kit.cpp
+++ b/src/plugins/projectexplorer/kit.cpp
@@ -269,11 +269,9 @@ void Kit::fix()
 void Kit::setup()
 {
     KitGuard g(this);
-    // Process the KitInfos in reverse order: They may only be based on other information lower in
-    // the stack.
-    QList<KitInformation *> info = KitManager::kitInformation();
-    for (int i = info.count() - 1; i >= 0; --i)
-        info.at(i)->setup(this);
+    const QList<KitInformation *> info = KitManager::kitInformation();
+    for (KitInformation * const ki : info)
+        ki->setup(this);
 }
 
 void Kit::upgrade()
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 499f1f19b45..0b6e5a8b16e 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -69,9 +69,11 @@ class KitManagerPrivate
 public:
     Kit *m_defaultKit = nullptr;
     bool m_initialized = false;
-    std::vector<std::unique_ptr<KitInformation>> m_informationList;
     std::vector<std::unique_ptr<Kit>> m_kitList;
     std::unique_ptr<PersistentSettingsWriter> m_writer;
+
+    // Sorted by priority, in descending order.
+    std::vector<std::unique_ptr<KitInformation>> m_informationList;
 };
 
 } // namespace Internal