1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spelling of FFmpeg in (end-)user-visible string of windeployqt

Browse Source 
It's two capital "FF", lowercase "mpeg".

Pick-to: 6.7 6.6 6.5
Change-Id: I4eca719fa6ce0133e3ddb6163c81e24493b378e3
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
This commit is contained in:
Volker Hilsheimer 2024-03-01 12:37:33 +01:00
parent 83f73df3e0
commit 7bde3f4c4c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/windeployqt/main.cpp
View File

@ -473,7 +473,7 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
parser->addOption(suppressSoftwareRasterizerOption); parser->addOption(suppressSoftwareRasterizerOption);
QCommandLineOption noFFmpegOption(QStringLiteral("no-ffmpeg"), QCommandLineOption noFFmpegOption(QStringLiteral("no-ffmpeg"),
QStringLiteral("Do not deploy the ffmpeg libraries.")); QStringLiteral("Do not deploy the FFmpeg libraries."));
parser->addOption(noFFmpegOption); parser->addOption(noFFmpegOption);
@ -1598,7 +1598,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
} }
} // Windows } // Windows
// Add ffmpeg if we deploy the ffmpeg backend // Add FFmpeg if we deploy the FFmpeg backend
if (options.ffmpeg if (options.ffmpeg
&& !plugins.filter(QStringLiteral("ffmpegmediaplugin"), Qt::CaseInsensitive).empty()) { && !plugins.filter(QStringLiteral("ffmpegmediaplugin"), Qt::CaseInsensitive).empty()) {
deployedQtLibraries.append(findFFmpegLibs(qtBinDir, options.platform)); deployedQtLibraries.append(findFFmpegLibs(qtBinDir, options.platform));