forked from qt-creator/qt-creator
Utils: Drop a direct use of QFileInfo
... in buildablehelperlibrary.cpp Change-Id: I21ffe1a97672e4d0053982b6581c518bca62eb97 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -7,7 +7,6 @@
|
|||||||
#include "qtcprocess.h"
|
#include "qtcprocess.h"
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QDir>
|
|
||||||
#include <QRegularExpression>
|
#include <QRegularExpression>
|
||||||
|
|
||||||
#include <set>
|
#include <set>
|
||||||
@@ -84,10 +83,10 @@ FilePath BuildableHelperLibrary::findSystemQt(const Environment &env)
|
|||||||
FilePaths BuildableHelperLibrary::findQtsInEnvironment(const Environment &env, int maxCount)
|
FilePaths BuildableHelperLibrary::findQtsInEnvironment(const Environment &env, int maxCount)
|
||||||
{
|
{
|
||||||
FilePaths qmakeList;
|
FilePaths qmakeList;
|
||||||
std::set<QString> canonicalEnvPaths;
|
std::set<FilePath> canonicalEnvPaths;
|
||||||
const FilePaths paths = env.path();
|
const FilePaths paths = env.path();
|
||||||
for (const FilePath &path : paths) {
|
for (const FilePath &path : paths) {
|
||||||
if (!canonicalEnvPaths.insert(path.toFileInfo().canonicalFilePath()).second)
|
if (!canonicalEnvPaths.insert(path.canonicalPath()).second)
|
||||||
continue;
|
continue;
|
||||||
const FilePath qmake = findQmakeInDir(path);
|
const FilePath qmake = findQmakeInDir(path);
|
||||||
if (qmake.isEmpty())
|
if (qmake.isEmpty())
|
||||||
|
Reference in New Issue
Block a user