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

QMake: Use Qt::SplitBehavior in preference to QString::SplitBehavior

Browse Source 
The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.

Change-Id: I3f1b836cfb47bba0fdc27f2c3aa7b0576d123dca
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Edward Welbourne 2020-02-25 17:19:30 +01:00
parent 00f0863cbe
commit 26b1cf2bba
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/makefile.cpp
View File

@ -1813,7 +1813,7 @@ static QStringList splitDeps(const QString &indeps, bool lineMode)
{ {
if (!lineMode) if (!lineMode)
return indeps.simplified().split(' '); return indeps.simplified().split(' ');
QStringList deps = indeps.split('\n', QString::SkipEmptyParts); QStringList deps = indeps.split('\n', Qt::SkipEmptyParts);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
for (auto &dep : deps) { for (auto &dep : deps) {
if (dep.endsWith(QLatin1Char('\r'))) if (dep.endsWith(QLatin1Char('\r')))

2
qmake/generators/win32/winmakefile.cpp
View File

@ -312,7 +312,7 @@ void Win32MakefileGenerator::processRcFileVar()
QByteArray rcString; QByteArray rcString;
QTextStream ts(&rcString, QFile::WriteOnly); QTextStream ts(&rcString, QFile::WriteOnly);
QStringList vers = project->first("VERSION").toQString().split(".", QString::SkipEmptyParts); QStringList vers = project->first("VERSION").toQString().split(".", Qt::SkipEmptyParts);
for (int i = vers.size(); i < 4; i++) for (int i = vers.size(); i < 4; i++)
vers += "0"; vers += "0";
QString versionString = vers.join('.'); QString versionString = vers.join('.');

6
qmake/library/qmakebuiltins.cpp
View File

@ -772,7 +772,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
const auto vars = values(map(args.at(0))); const auto vars = values(map(args.at(0)));
for (const ProString &var : vars) { for (const ProString &var : vars) {
// FIXME: this is inconsistent with the "there are no empty strings" dogma. // FIXME: this is inconsistent with the "there are no empty strings" dogma.
const auto splits = var.toQStringRef().split(sep, QString::KeepEmptyParts); const auto splits = var.toQStringRef().split(sep, Qt::KeepEmptyParts);
for (const auto &splt : splits) for (const auto &splt : splits)
ret << ProString(splt).setSource(var); ret << ProString(splt).setSource(var);
} }
@ -1576,7 +1576,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
if (args.count() == 1) if (args.count() == 1)
return returnBool(isActiveConfig(args.at(0).toQStringRef())); return returnBool(isActiveConfig(args.at(0).toQStringRef()));
const auto mutuals = args.at(1).toQStringRef().split(QLatin1Char('|'), const auto mutuals = args.at(1).toQStringRef().split(QLatin1Char('|'),
QString::SkipEmptyParts); Qt::SkipEmptyParts);
const ProStringList &configs = values(statics.strCONFIG); const ProStringList &configs = values(statics.strCONFIG);
for (int i = configs.size() - 1; i >= 0; i--) { for (int i = configs.size() - 1; i >= 0; i--) {
@ -1610,7 +1610,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
} }
} else { } else {
const auto mutuals = args.at(2).toQStringRef().split(QLatin1Char('|'), const auto mutuals = args.at(2).toQStringRef().split(QLatin1Char('|'),
QString::SkipEmptyParts); Qt::SkipEmptyParts);
for (int i = l.size() - 1; i >= 0; i--) { for (int i = l.size() - 1; i >= 0; i--) {
const ProString &val = l[i]; const ProString &val = l[i];
for (int mut = 0; mut < mutuals.count(); mut++) { for (int mut = 0; mut < mutuals.count(); mut++) {

4
qmake/library/qmakeevaluator.cpp
View File

@ -883,7 +883,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProVariable(
return ReturnTrue; return ReturnTrue;
} }
QChar sep = val.at(1); QChar sep = val.at(1);
auto func = val.split(sep, QString::KeepEmptyParts); auto func = val.split(sep, Qt::KeepEmptyParts);
if (func.count() < 3 || func.count() > 4) { if (func.count() < 3 || func.count() > 4) {
evalError(fL1S("The s/// function expects 3 or 4 arguments.")); evalError(fL1S("The s/// function expects 3 or 4 arguments."));
return ReturnTrue; return ReturnTrue;
@ -1022,7 +1022,7 @@ static ProString msvcArchitecture(const QString &vcInstallDir, const QString &pa
QString vcBinDir = vcInstallDir; QString vcBinDir = vcInstallDir;
if (vcBinDir.endsWith(QLatin1Char('\\'))) if (vcBinDir.endsWith(QLatin1Char('\\')))
vcBinDir.chop(1); vcBinDir.chop(1);
const auto dirs = pathVar.split(QLatin1Char(';'), QString::SkipEmptyParts); const auto dirs = pathVar.split(QLatin1Char(';'), Qt::SkipEmptyParts);
for (const QString &dir : dirs) { for (const QString &dir : dirs) {
if (!dir.startsWith(vcBinDir, Qt::CaseInsensitive)) if (!dir.startsWith(vcBinDir, Qt::CaseInsensitive))
continue; continue;

2
qmake/library/qmakeglobals.cpp
View File

@ -260,7 +260,7 @@ QStringList QMakeGlobals::splitPathList(const QString &val) const
QStringList ret; QStringList ret;
if (!val.isEmpty()) { if (!val.isEmpty()) {
QString cwd(QDir::currentPath()); QString cwd(QDir::currentPath());
const QStringList vals = val.split(dirlist_sep, QString::SkipEmptyParts); const QStringList vals = val.split(dirlist_sep, Qt::SkipEmptyParts);
ret.reserve(vals.length()); ret.reserve(vals.length());
for (const QString &it : vals) for (const QString &it : vals)
ret << IoUtils::resolvePath(cwd, it); ret << IoUtils::resolvePath(cwd, it);

2
tests/auto/tools/qmakelib/evaltest.cpp
View File

@ -2859,7 +2859,7 @@ void tst_qmakelib::proEval()
QString infile = m_indir + "/test.pro"; QString infile = m_indir + "/test.pro";
bool verified = true; bool verified = true;
QMakeTestHandler handler; QMakeTestHandler handler;
handler.setExpectedMessages(msgs.replace("##:", infile + ':').split('\n', QString::SkipEmptyParts)); handler.setExpectedMessages(msgs.replace("##:", infile + ':').split('\n', Qt::SkipEmptyParts));
QMakeVfs vfs; QMakeVfs vfs;
ProFileCache cache; ProFileCache cache;
QMakeParser parser(&cache, &vfs, &handler); QMakeParser parser(&cache, &vfs, &handler);

2
tests/auto/tools/qmakelib/parsertest.cpp
View File

@ -2028,7 +2028,7 @@ void tst_qmakelib::proParser()
bool verified = true; bool verified = true;
QMakeTestHandler handler; QMakeTestHandler handler;
handler.setExpectedMessages(msgs.split('\n', QString::SkipEmptyParts)); handler.setExpectedMessages(msgs.split('\n', Qt::SkipEmptyParts));
QMakeVfs vfs; QMakeVfs vfs;
QMakeParser parser(0, &vfs, &handler); QMakeParser parser(0, &vfs, &handler);
ProFile *pro = parser.parsedProBlock(QStringRef(&in), 0, "in", 1, QMakeParser::FullGrammar); ProFile *pro = parser.parsedProBlock(QStringRef(&in), 0, "in", 1, QMakeParser::FullGrammar);