diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-27 20:39:37 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-09-14 13:50:45 +0000 |
| commit | 194b794e4723fef972982a386bd839172d984ec6 (patch) | |
| tree | a38882789725545b6cc05d190c3a3b8d9fda04a7 | |
| parent | 7ab0e6e888e049f0d8ae48814eb4ecb1116de1b9 (diff) | |
| download | qttools-194b794e4723fef972982a386bd839172d984ec6.tar.gz | |
qmake: make even more use QStringRef and QStringView overloads
Change-Id: If067368529f89347a4618a24e2737e04b4fc0ce3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/b9835aef1a36688ea99602e25e9c73e645d3851a)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | src/linguist/shared/qmakebuiltins.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp index 3c237debd..5acab29ba 100644 --- a/src/linguist/shared/qmakebuiltins.cpp +++ b/src/linguist/shared/qmakebuiltins.cpp @@ -1644,9 +1644,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( } for (ProValueMap::ConstIterator it = symbols.constBegin(); it != symbols.constEnd(); ++it) { - const QString &ky = it.key().toQString(m_tmp1); - if (!ky.startsWith(QLatin1Char('.'))) - newMap.insert(ProKey(parseInto + ky), it.value()); + if (!it.key().startsWith(QLatin1Char('.'))) + newMap.insert(ProKey(parseInto + it.key()), it.value()); } m_valuemapStack.top() = newMap; } @@ -1802,7 +1801,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( } else if (opt == QLatin1String("exe")) { flags |= QMakeVfs::VfsExecutable; } 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; } } @@ -1853,7 +1852,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( } else if (opt == QLatin1String("sub")) { mode = CacheSub; } else { - evalError(fL1S("cache(): invalid flag %1.").arg(opt.toQString(m_tmp3))); + evalError(fL1S("cache(): invalid flag %1.").arg(opt.toQStringView())); return ReturnFalse; } } |