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

Docker: Detect qt6 in ubuntu container

Browse Source 
Installing Qt 6 via the distribution packages has a
misconfigured qtchooser. To allow us to find Qt6 on these systems,
we directly search for "qmake6" as well.

Change-Id: I43f190bd2c69a0ea818308ff47bb6d9f2968e12f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-10-13 13:32:21 +02:00
parent a22d62e57d
commit f555a54f5a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/docker/kitdetector.cpp
View File

@@ -233,7 +233,7 @@ QtVersions KitDetectorPrivate::autoDetectQtVersions() const
emit q->logOutput(ProjectExplorer::Tr::tr("Searching for qmake executables...")); emit q->logOutput(ProjectExplorer::Tr::tr("Searching for qmake executables..."));
const QStringList candidates = {"qmake-qt6", "qmake-qt5", "qmake"}; const QStringList candidates = {"qmake6", "qmake-qt6", "qmake-qt5", "qmake"};
for (const FilePath &searchPath : m_searchPaths) { for (const FilePath &searchPath : m_searchPaths) {
searchPath.iterateDirectory(handleQmake, searchPath.iterateDirectory(handleQmake,
{candidates, {candidates,