summaryrefslogtreecommitdiffstats
path: root/src/tools/windeployqt/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/windeployqt/main.cpp')
-rw-r--r--src/tools/windeployqt/main.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp
index e35330ebeb3..6cb935ef47d 100644
--- a/src/tools/windeployqt/main.cpp
+++ b/src/tools/windeployqt/main.cpp
@@ -592,15 +592,17 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
}
// default to deployment of compiler runtime for windows desktop configurations
- if (options->platform == WindowsDesktopMinGW || options->platform.testFlags(WindowsDesktopMsvc)
- || parser->isSet(compilerRunTimeOption))
+ if (options->platform == WindowsDesktopMinGW || options->platform == WindowsDesktopClangMinGW
+ || options->platform.testFlags(WindowsDesktopMsvc) || parser->isSet(compilerRunTimeOption))
options->compilerRunTime = true;
if (parser->isSet(noCompilerRunTimeOption))
options->compilerRunTime = false;
if (options->compilerRunTime && options->platform != WindowsDesktopMinGW
+ && options->platform != WindowsDesktopClangMinGW
&& !options->platform.testFlags(WindowsDesktopMsvc)) {
- *errorMessage = QStringLiteral("Deployment of the compiler runtime is implemented for Desktop MSVC/g++ only.");
+ *errorMessage = QStringLiteral("Deployment of the compiler runtime is implemented for "
+ "Desktop MSVC and MinGW (g++ and Clang) only.");
return CommandLineParseError;
}