diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:30:28 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:30:35 +0200 |
| commit | b0e9c1c5367ab6da76850139bddab2578fc179cd (patch) | |
| tree | 982f0f0931490814bb87eb9b00e5a5288b5567eb /src/linguist/lupdate/qdeclarative.cpp | |
| parent | 1a858d32fef239bca95b72b8fd2186b30983a2af (diff) | |
| parent | 636bf4a38283fde099869e7767222e3477def0ea (diff) | |
| download | qttools-b0e9c1c5367ab6da76850139bddab2578fc179cd.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/linguist/lupdate/qdeclarative.cpp')
| -rw-r--r-- | src/linguist/lupdate/qdeclarative.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/linguist/lupdate/qdeclarative.cpp b/src/linguist/lupdate/qdeclarative.cpp index fa8ad260e..707ea0b79 100644 --- a/src/linguist/lupdate/qdeclarative.cpp +++ b/src/linguist/lupdate/qdeclarative.cpp @@ -112,6 +112,10 @@ protected: yyMsg(identLineNo) << qPrintable(LU::tr("%1() requires at least one argument.\n").arg(name)); return; } + if (AST::cast<AST::TemplateLiteral *>(node->arguments->expression)) { + yyMsg(identLineNo) << qPrintable(LU::tr("%1() cannot be used with template literals. Ignoring\n").arg(name)); + return; + } QString source; if (!createString(node->arguments->expression, &source)) |