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

qmake: skip empty parts when splitting strings in some more places

Browse Source 
... and make it explicit where we can't do that for semantical or
backwards compat reasons.

most urgently, this fixes an assertion failure when $QMAKEFEATURES
contains empty paths (e.g., due to a trailing semicolon).

notable observation: QByteArray::split() has no argument for the split
behavior (it always keeps empty parts).

Task-number: QTBUG-47325
Change-Id: I72d4b2e154a2ed1802cfa98fb4a5211a68e43231
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2018-05-29 16:36:53 +02:00
parent 94f249977c
commit 7c87ffff9a
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qmake/library/qmakebuiltins.cpp
View File

@ -738,7 +738,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
const QString &sep = (args.count() == 2) ? args.at(1).toQString(m_tmp1) : statics.field_sep; const QString &sep = (args.count() == 2) ? args.at(1).toQString(m_tmp1) : statics.field_sep;
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) {
const auto splits = var.toQStringRef().split(sep); // FIXME: this is inconsistent with the "there are no empty strings" dogma.
const auto splits = var.toQStringRef().split(sep, QString::KeepEmptyParts);
for (const auto &splt : splits) for (const auto &splt : splits)
ret << ProString(splt).setSource(var); ret << ProString(splt).setSource(var);
} }
@ -1445,7 +1446,8 @@ 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);
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--) {
@ -1477,7 +1479,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
return ReturnTrue; return ReturnTrue;
} }
} else { } else {
const auto mutuals = args.at(2).toQStringRef().split(QLatin1Char('|')); const auto mutuals = args.at(2).toQStringRef().split(QLatin1Char('|'),
QString::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++) {

5
qmake/library/qmakeevaluator.cpp
View File

@ -297,6 +297,7 @@ ProStringList QMakeEvaluator::split_value_list(const QStringRef &vals, int sourc
case '\'': case '\'':
if (!quote) if (!quote)
quote = unicode; quote = unicode;
// FIXME: this is inconsistent with the "there are no empty strings" dogma.
hadWord = true; hadWord = true;
break; break;
case ' ': case ' ':
@ -879,7 +880,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProVariable(
return ReturnTrue; return ReturnTrue;
} }
QChar sep = val.at(1); QChar sep = val.at(1);
auto func = val.split(sep); auto func = val.split(sep, QString::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;
@ -1018,7 +1019,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(';')); const auto dirs = pathVar.split(QLatin1Char(';'), QString::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

@ -261,7 +261,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); const QStringList vals = val.split(dirlist_sep, QString::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);