From 3480921b44f7a4dc8a38656a9722c1507a1b840a Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 7 Jun 2019 16:00:59 +0200 Subject: lupdate: Warn about calls with template literals JS template literals do not really mix well with the Qt Linguist toochain, at least if template arguments are used: This makes the source string dynamic. So far qsTr(``) calls were just ignored. Now lupdate prints a warning. Task-number: QTBUG-76265 Change-Id: I935c382695a86ecd6fd076b31a68fa987be8fd84 Reviewed-by: Lucie Gerard Reviewed-by: Ulf Hermann --- src/linguist/lupdate/qdeclarative.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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(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)) -- cgit v1.2.3