feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Fix header-related issues in CMakeToolManager

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

Change-Id: Iec5cf98e7cfad7ee1bdd98df85df38b03c54dff4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-06-29 13:39:26 +02:00
parent 1c014c7573
commit dca645f4c0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
View File

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