40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
--- a/src/tools/windeployqt/main.cpp
|
|
+++ b/src/tools/windeployqt/main.cpp
|
|
@@ -557,9 +557,6 @@
|
|
options->quickImports = !parser->isSet(noQuickImportOption);
|
|
|
|
// default to deployment of compiler runtime for windows desktop configurations
|
|
- if (options->platform == WindowsDesktopMinGW || options->platform.testFlags(WindowsDesktopMsvc)
|
|
- || parser->isSet(compilerRunTimeOption))
|
|
- options->compilerRunTime = true;
|
|
if (parser->isSet(noCompilerRunTimeOption))
|
|
options->compilerRunTime = false;
|
|
|
|
@@ -1301,7 +1301,7 @@
|
|
QStringList result;
|
|
switch (platform) {
|
|
case WindowsDesktopMinGW: {
|
|
- const QStringList minGWRuntimes = { "*gcc_"_L1, "*stdc++"_L1, "*winpthread"_L1 };
|
|
+ const QStringList minGWRuntimes = { "*gcc_s_"_L1, "*stdc++"_L1, "*winpthread"_L1 };
|
|
result.append(findMinGWRuntimePaths(qtBinDir, platform, minGWRuntimes));
|
|
break;
|
|
}
|
|
@@ -1479,7 +1476,7 @@
|
|
*errorMessage = QDir::toNativeSeparators(options.binaries.first()) + QStringLiteral(" does not seem to be a Qt executable.");
|
|
return result;
|
|
}
|
|
-
|
|
+#if 0
|
|
// Some Windows-specific checks: Qt5Core depends on ICU when configured with "-icu". Other than
|
|
// that, Qt5WebKit has a hard dependency on ICU.
|
|
if (options.platform.testFlag(WindowsBased)) {
|
|
@@ -1519,7 +1516,7 @@
|
|
} // !icuLibs.isEmpty()
|
|
} // Qt6Core/Qt6WebKit
|
|
} // Windows
|
|
-
|
|
+#endif
|
|
// Scan Quick2 imports
|
|
QmlImportScanResult qmlScanResult;
|
|
if (options.quickImports && usesQml2) {
|