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

QtSupport: Try harder to uniquify the list of auto-detected qmakes

Browse Source 
Fixes: QTCREATORBUG-23459
Change-Id: I40d1baee48489a6fd439f7ece8b1c5ee664c75c6
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-01-16 17:25:38 +01:00
parent 21f6445781
commit 37e7b72609
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qtsupport/qtversionmanager.cpp
View File

@@ -39,6 +39,7 @@
#include <utils/algorithm.h>
#include <utils/buildablehelperlibrary.h>
#include <utils/environment.h>
#include <utils/filesystemwatcher.h>
#include <utils/hostosinfo.h>
#include <utils/persistentsettings.h>
@@ -429,11 +430,16 @@ static void findSystemQt()
{
FilePaths systemQMakes
= BuildableHelperLibrary::findQtsInEnvironment(Environment::systemEnvironment());
systemQMakes.append(gatherQmakePathsFromQtChooser());
const FilePaths uniqueSystemQmakes = Utils::filteredUnique(systemQMakes);
for (const FilePath &qmakePath : uniqueSystemQmakes) {
for (const FilePath &qmakePath : qAsConst(systemQMakes)) {
if (BuildableHelperLibrary::isQtChooser(qmakePath.toFileInfo()))
continue;
const auto isSameQmake = [qmakePath](const BaseQtVersion *version) {
return Environment::systemEnvironment().
isSameExecutable(qmakePath.toString(), version->qmakeCommand().toString());
};
if (contains(m_versions, isSameQmake))
continue;
BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(qmakePath,
false,
"PATH");