From dca645f4c01c1344fc4e907979a8b33d29471053 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Fri, 29 Jun 2018 13:39:26 +0200
Subject: [PATCH] CMake: Fix header-related issues in CMakeToolManager

Just reorder some lines, make it clearer where the headers are actually
used.

Change-Id: Iec5cf98e7cfad7ee1bdd98df85df38b03c54dff4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
index 97e7021f141..794b3ac0cc4 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
@@ -26,11 +26,11 @@
 #include "cmaketoolmanager.h"
 
 #include <coreplugin/icore.h>
-#include <projectexplorer/toolchainmanager.h>
+
+#include <utils/algorithm.h>
+#include <utils/environment.h>
 #include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
-#include <utils/environment.h>
-#include <utils/algorithm.h>
 
 #include <QFileInfo>
 #include <QDebug>
@@ -143,7 +143,7 @@ static QList<CMakeTool *> autoDetectCMakeTools()
 
         QFileInfo fi;
         for (const QString &exec : execs) {
-            fi.setFile(base.toString(), exec);
+            fi.setFile(QDir(base.toString()), exec);
             if (fi.exists() && fi.isFile() && fi.isExecutable())
                 suspects << FileName::fromString(fi.absoluteFilePath());
         }