diff options
Diffstat (limited to 'src/libs/utils/buildablehelperlibrary.cpp')
| -rw-r--r-- | src/libs/utils/buildablehelperlibrary.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index b1988bf8c3..fdebca957e 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -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. |