AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windeployqt: Fix mismatches between string types and literals

Browse Source 
Addressing some comments from the review of QTBUG-98434.

Fix the mismatches between string types and string literals.

Task-number: QTBUG-103100
Change-Id: Id619d7b99b9133c983f31ec5a5c2d9cc9d927416
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Mate Barany 2022-09-21 17:10:48 +02:00
parent a51e7876b8
commit 3d9013c5f9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,7 +270,7 @@ static inline QString findBinary(const QString &directory, Platform platform)
static QString msgFileDoesNotExist(const QString & file)
{
return u'"' + QDir::toNativeSeparators(file) + QStringLiteral("\" does not exist.");
return u'"' + QDir::toNativeSeparators(file) + "\" does not exist."_L1;
}
enum CommandLineParseFlag {
@ -285,10 +285,10 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
using OptionPtrVector = QList<CommandLineOptionPtr>;
parser->setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
parser->setApplicationDescription(QStringLiteral("Qt Deploy Tool ") + QT_VERSION_STR ""_L1
+ "\n\nThe simplest way to use windeployqt is to add the bin directory of your Qt\n"
parser->setApplicationDescription(u"Qt Deploy Tool " QT_VERSION_STR
"\n\nThe simplest way to use windeployqt is to add the bin directory of your Qt\n"
"installation (e.g. <QT_DIR\\bin>) to the PATH variable and then run:\n windeployqt <path-to-app-binary>\n\n"
"If your application uses Qt Quick, run:\n windeployqt --qmldir <path-to-app-qml-files> <path-to-app-binary>"_L1);
"If your application uses Qt Quick, run:\n windeployqt --qmldir <path-to-app-qml-files> <path-to-app-binary>"_s);
const QCommandLineOption helpOption = parser->addHelpOption();
parser->addVersionOption();
@ -891,7 +891,7 @@ QStringList findQtPlugins(quint64 *usedQtModules, quint64 disabledQtModules,
return QStringList();
QDir pluginsDir(qtPluginsDirName);
QStringList result;
const QFileInfoList &pluginDirs = pluginsDir.entryInfoList(QStringList("*"_L1), QDir::Dirs | QDir::NoDotAndDotDot);
const QFileInfoList &pluginDirs = pluginsDir.entryInfoList(QStringList(u"*"_s), QDir::Dirs | QDir::NoDotAndDotDot);
for (const QFileInfo &subDirFi : pluginDirs) {
const QString subDirName = subDirFi.fileName();
const quint64 module = qtModuleForPlugin(subDirName);
@ -921,7 +921,7 @@ QStringList findQtPlugins(quint64 *usedQtModules, quint64 disabledQtModules,
break;
}
} else {
filter = "*"_L1;
filter = u"*"_s;
}
const QStringList plugins = findSharedLibraries(subDir, platform, debugMatchMode, filter);
for (const QString &plugin : plugins) {
@ -968,7 +968,7 @@ static QStringList translationNameFilters(quint64 modules, const QString &prefix
for (const auto &qtModule : qtModuleEntries) {
if ((qtModule.module & modules) && qtModule.translation) {
const QString name = QLatin1StringView(qtModule.translation) +
u'_' + prefix + QStringLiteral(".qm");
u'_' + prefix + ".qm"_L1;
if (!result.contains(name))
result.push_back(name);
}
@ -1138,11 +1138,11 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned
const QStringList countryCodes = vcRedistDir.entryList(QStringList(QStringLiteral("[0-9]*")), QDir::Dirs);
if (!countryCodes.isEmpty()) // Pre MSVC2017
releaseRedistDir += u'/' + countryCodes.constFirst();
QFileInfo fi(releaseRedistDir + u'/' + QStringLiteral("vc_redist.")
+ machineArchString + QStringLiteral(".exe"));
QFileInfo fi(releaseRedistDir + "/vc_redist."_L1
+ machineArchString + ".exe"_L1);
if (!fi.isFile()) { // Pre MSVC2017/15.5
fi.setFile(releaseRedistDir + u'/' + QStringLiteral("vcredist_")
+ machineArchString + QStringLiteral(".exe"));
fi.setFile(releaseRedistDir + "/vcredist_"_L1
+ machineArchString + ".exe"_L1);
}
if (fi.isFile())
redistFiles.append(fi.absoluteFilePath());