diff options
| author | hjk <hjk@qt.io> | 2022-07-13 09:27:18 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-07-13 09:44:09 +0000 |
| commit | 802de0eb5ee4d29a1e75764880989ba572f6af27 (patch) | |
| tree | 07ff1a2075d7b51b1b1d647316b9f527522c5470 /src/shared/proparser/qmakebuiltins.cpp | |
| parent | 480da99508094f59366e4066c7cb239c9b36a1ed (diff) | |
| download | qt-creator-802de0eb5ee4d29a1e75764880989ba572f6af27.tar.gz | |
Utils: Collapse most of porting,h
Taking the Qt 6 branches, leaving some dummies until downstream
adapted.
Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/shared/proparser/qmakebuiltins.cpp')
| -rw-r--r-- | src/shared/proparser/qmakebuiltins.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index c47bc1b2e7..d68fa90f39 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -885,7 +885,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand( ret += ProString(stream.readLine()); } else { const QString &line = stream.readLine(); - ret += split_value_list(Utils::make_stringview(line).trimmed()); + ret += split_value_list(QStringView(line).trimmed()); if (!singleLine) ret += ProString("\n"); } @@ -972,7 +972,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand( output.replace(QLatin1Char('\t'), QLatin1Char(' ')); if (singleLine) output.replace(QLatin1Char('\n'), QLatin1Char(' ')); - ret += split_value_list(Utils::make_stringview(output)); + ret += split_value_list(QStringView(output)); } } } @@ -1145,7 +1145,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand( evalError(fL1S("Unexpected EOF.")); return ReturnError; } - ret = split_value_list(Utils::make_stringview(line)); + ret = split_value_list(QStringView(line)); } } break; } @@ -1503,7 +1503,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( case T_EVAL: { VisitReturn ret = ReturnFalse; QString contents = args.join(statics.field_sep); - ProFile *pro = m_parser->parsedProBlock(Utils::make_stringview(contents), + ProFile *pro = m_parser->parsedProBlock(QStringView(contents), 0, m_current.pro->fileName(), m_current.line); if (m_cumulative || pro->isOk()) { m_locationStack.push(m_current); |