diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2021-01-07 07:07:24 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-01-07 11:39:17 +0000 |
| commit | f85129f24c8bf250df860499de859ed198f46d74 (patch) | |
| tree | 946b9c755c67e7d313e4316a014fd452cffff4ac | |
| parent | a7b63a0905b149168099ec8b046eca07d8f70f6b (diff) | |
windeployqt: Restore default behavior for compiler runtime deployment
For MSVC desktop and MinGW desktop builds the compiler runtime should be
deployed by default. This default was changed by mistake in
317c2b4af885f854a30235959565e0af8376d64f.
Change-Id: Ia403f5beb3092aa692584c77cd5f96393f79d456
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit baf783991e36aafe6921a40043b414192fb523a2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/windeployqt/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 4839c6392..f7741f4aa 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -479,9 +479,11 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse options->systemD3dCompiler = !parser->isSet(noSystemD3DCompilerOption); options->quickImports = !parser->isSet(noQuickImportOption); - if (parser->isSet(compilerRunTimeOption)) + // default to deployment of compiler runtime for windows desktop configurations + if (options->platform == WindowsDesktopMinGW || options->platform == WindowsDesktopMsvc + || parser->isSet(compilerRunTimeOption)) options->compilerRunTime = true; - else if (parser->isSet(noCompilerRunTimeOption)) + if (parser->isSet(noCompilerRunTimeOption)) options->compilerRunTime = false; if (options->compilerRunTime && options->platform != WindowsDesktopMinGW && options->platform != WindowsDesktopMsvc) { |