diff options
| author | Lucie Gérard <lucie.gerard@qt.io> | 2021-07-01 15:02:09 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-02 13:19:39 +0000 |
| commit | 319fe619d88f283223cc98653a7a52409f1dce87 (patch) | |
| tree | 7719fd3e8521f0b57d2adcf33448aebc0415a601 | |
| parent | 649e92d86a975ee12d6a3ef78f4dd4e707dcd18c (diff) | |
lupdate/clang: Correct testing of skipped code warning
Change-Id: I705df3115a29d59e1ca4736ddadd0f4ec5f9bd01
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 839342579c1cbc5a7826b7bef19b7a8b7f8b6d1b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/linguist/lupdate/lupdatepreprocessoraction.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/preprocess_clang_parser/expectedoutput.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp index d66f3f053..24bb212c5 100644 --- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp +++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp @@ -165,8 +165,8 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange, qCDebug(lcClang) << "SourceRangeSkipped: skipped text:" << skippedText.str(); unsigned int beginLine = sm.getExpansionLineNumber(sourceRange.getBegin()); unsigned int endLine = sm.getExpansionLineNumber(sourceRange.getEnd()); - qWarning("Code with translation information has been skipped " - "in file %s between lines %d and %d", + qWarning("%s Code with translation information has been skipped " + "between lines %d and %d", m_inputFile.c_str(), beginLine, endLine); } diff --git a/tests/auto/linguist/lupdate/testdata/good/preprocess_clang_parser/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/preprocess_clang_parser/expectedoutput.txt index 22bb31a24..fe7615b1e 100644 --- a/tests/auto/linguist/lupdate/testdata/good/preprocess_clang_parser/expectedoutput.txt +++ b/tests/auto/linguist/lupdate/testdata/good/preprocess_clang_parser/expectedoutput.txt @@ -1 +1 @@ -Code with translation information has been skipped in file .* +.*[/\\]lupdate[/\\]testdata[/\\]good[/\\]preprocess_clang_parser[/\\]main.cpp Code with translation information has been skipped between lines .. and .. |