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

qmake: make even more use QStringRef and QStringView overloads

Browse Source 
Change-Id: If067368529f89347a4618a24e2737e04b4fc0ce3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2018-04-27 20:39:37 +02:00
parent 9bc616948f
commit b9835aef1a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qmake/library/qmakebuiltins.cpp
View File

@ -1644,9 +1644,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
} }
for (ProValueMap::ConstIterator it = symbols.constBegin(); for (ProValueMap::ConstIterator it = symbols.constBegin();
it != symbols.constEnd(); ++it) { it != symbols.constEnd(); ++it) {
const QString &ky = it.key().toQString(m_tmp1); if (!it.key().startsWith(QLatin1Char('.')))
if (!ky.startsWith(QLatin1Char('.'))) newMap.insert(ProKey(parseInto + it.key()), it.value());
newMap.insert(ProKey(parseInto + ky), it.value());
} }
m_valuemapStack.top() = newMap; m_valuemapStack.top() = newMap;
} }
@ -1802,7 +1801,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
} else if (opt == QLatin1String("exe")) { } else if (opt == QLatin1String("exe")) {
flags |= QMakeVfs::VfsExecutable; flags |= QMakeVfs::VfsExecutable;
} else { } else {
evalError(fL1S("write_file(): invalid flag %1.").arg(opt.toQString(m_tmp3))); evalError(fL1S("write_file(): invalid flag %1.").arg(opt.toQStringView()));
return ReturnFalse; return ReturnFalse;
} }
} }
@ -1853,7 +1852,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
} else if (opt == QLatin1String("sub")) { } else if (opt == QLatin1String("sub")) {
mode = CacheSub; mode = CacheSub;
} else { } else {
evalError(fL1S("cache(): invalid flag %1.").arg(opt.toQString(m_tmp3))); evalError(fL1S("cache(): invalid flag %1.").arg(opt.toQStringView()));
return ReturnFalse; return ReturnFalse;
} }
} }