From 15f6ba38b67d0e5819aa121a9f5ea1ac77ab8e20 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 20 Mar 2019 12:45:53 +0100
Subject: [PATCH] PE: Fix compiler for constructing default kit

Amends e94f5b496ecd9ca212009bd24368265e1df8199b.

Change-Id: I9510c2231750a2ce58bc37c533735d9709eb0ca0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/kitmanager.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 4a9d513f55d..94353071bee 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -252,12 +252,21 @@ void KitManager::restoreKits()
             }
             const QString bestFilePath = bestTc->compilerCommand().toString();
             const QString currentFilePath = tc->compilerCommand().toString();
-            if ((currentFilePath.contains("icecc") && !bestFilePath.contains("icecc"))
-                    || (currentFilePath.contains("ccache") && !bestFilePath.contains("ccache")
-                        && !bestFilePath.contains("icecc"))
-                    || (bestFilePath.length() > currentFilePath.length())) {
+            if (bestFilePath.contains("icecc"))
+                continue;
+            if (currentFilePath.contains("icecc")) {
                 bestTc = tc;
+                continue;
             }
+
+            if (bestFilePath.contains("ccache"))
+                continue;
+            if (currentFilePath.contains("ccache")) {
+                bestTc = tc;
+                continue;
+            }
+            if (bestFilePath.length() > currentFilePath.length())
+                bestTc = tc;
         }
 
         int maxWeight = 0;