From d5d4e2da8e66db8bf8f3fe8c83dc68ef3c55ca73 Mon Sep 17 00:00:00 2001 From: Andrii Semkiv Date: Fri, 1 Nov 2024 09:58:04 +0100 Subject: [PATCH] Utils: Accommodate cross-platform qmake setups File picker dialog filter was based exclusively on the host system. This created problems in some remote scenarios, for example, on Windows host it was impossible to select Linux target qmake. Fixes: QTCREATORBUG-31939 Change-Id: I6a6716a4ce198cd5732f39525baf4b8ded11f376 Reviewed-by: hjk --- src/libs/utils/buildablehelperlibrary.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index 3a678ffcda2..422c686bc50 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -159,13 +159,10 @@ QStringList BuildableHelperLibrary::possibleQMakeCommands() // On Unix some distributions renamed qmake with a postfix to avoid clashes // On OS X, Qt 4 binary packages also has renamed qmake. There are also symbolic links that are // named "qmake", but the file dialog always checks against resolved links (native Cocoa issue) - QStringList commands(HostOsInfo::withExecutableSuffix("qmake*")); - // Qt 6 CMake built targets, such as Android, are dependent on the host installation // and use a script wrapper around the host qmake executable - if (HostOsInfo::isWindowsHost()) - commands.append("qmake*.bat"); - return commands; + // Remote build configurations (e.g. Windows host + Linux target) must be taken into account too + return {"qmake*"}; } } // namespace Utils