From 7c3f61f8198743684ef655ff3fd486fde5a7466c Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 29 Jul 2016 14:08:48 +0200 Subject: [PATCH] QmlDesigner: Fix regular expression We have to use a non capturing group for the optional 'Id'. Change-Id: I59431d78908a16f571febdf14c57bfe079ca6817 Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 47f4315aa7d..72bfe1a78a5 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -189,7 +189,7 @@ bool QmlObjectNode::isTranslatableText(const PropertyName &name) const if (modelNode().metaInfo().isValid() && modelNode().metaInfo().hasProperty(name)) if (modelNode().metaInfo().propertyTypeName(name) == "QString" || modelNode().metaInfo().propertyTypeName(name) == "string") { if (modelNode().hasBindingProperty(name)) { - static QRegExp regularExpressionPatter(QLatin1String("qsTr(|Id)\\((\".*\")\\)")); + static QRegExp regularExpressionPatter(QLatin1String("qsTr(?:|Id)\\((\".*\")\\)")); return regularExpressionPatter.exactMatch(modelNode().bindingProperty(name).expression()); } @@ -202,7 +202,7 @@ bool QmlObjectNode::isTranslatableText(const PropertyName &name) const QString QmlObjectNode::stripedTranslatableText(const PropertyName &name) const { if (modelNode().hasBindingProperty(name)) { - static QRegExp regularExpressionPatter(QLatin1String("qsTr(|Id)\\(\"(.*)\"\\)")); + static QRegExp regularExpressionPatter(QLatin1String("qsTr(?:|Id)\\(\"(.*)\"\\)")); if (regularExpressionPatter.exactMatch(modelNode().bindingProperty(name).expression())) return regularExpressionPatter.cap(1); } else {