diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-26 14:32:20 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2019-09-27 10:05:55 +0000 |
| commit | dcd5df5823d61e3ad479f259dfd4a25d67a54e4a (patch) | |
| tree | e9f47da9963fbc60dba4a46eccf21c425c6f4bef /src/linguist | |
| parent | 0407495a027b8e662c773eafb50ab66fd4638962 (diff) | |
| parent | c8e79294237260d735324663932a676d8084efcb (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I5c06b3e0177fcccd988620ab269f75632689a54c
Diffstat (limited to 'src/linguist')
| -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 216bc8329..7a453aa32 100644 --- a/src/linguist/lupdate/qdeclarative.cpp +++ b/src/linguist/lupdate/qdeclarative.cpp @@ -108,6 +108,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)) |