Account for qmake.bat script for Qt 6 targets

Qt 6 targets that are built with CMake have a qmake.bat instead
of qmake.exe, while they can be registered from the Qt installer
using QC's sdktool, it's not yet possible to select a new version
manually because the FileDialog selection offers only qmake*.exe.

Fixes: QTCREATORBUG-24721
Change-Id: I647be1e0fba2f306402b8dbed747e9614a4eb0ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-10-14 11:41:39 +03:00
parent e7df6bba18
commit c121e48589

View File

@@ -179,7 +179,13 @@ 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)
return QStringList(HostOsInfo::withExecutableSuffix("qmake*"));
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;
}
// Copy helper source files to a target directory, replacing older files.