From f555a54f5a654606a2fb50e2829eef855960972c Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Thu, 13 Oct 2022 13:32:21 +0200
Subject: [PATCH] Docker: Detect qt6 in ubuntu container

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>
---
 src/plugins/docker/kitdetector.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/docker/kitdetector.cpp b/src/plugins/docker/kitdetector.cpp
index 18df41e8bae..252bd76d23a 100644
--- a/src/plugins/docker/kitdetector.cpp
+++ b/src/plugins/docker/kitdetector.cpp
@@ -233,7 +233,7 @@ QtVersions KitDetectorPrivate::autoDetectQtVersions() const
 
     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) {
         searchPath.iterateDirectory(handleQmake,
                                     {candidates,