summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2017-03-27 12:08:22 +0200
committerRobert Loehning <robert.loehning@qt.io>2017-03-28 13:25:40 +0000
commit93ce31ebb631cd9cd0d44c04c1b456db8a2e6d02 (patch)
tree2730fda26909592b388628b2b6789be318e6e3df
parent1da65616b941eb3ad23cefacd1ceb1c51ebdcbdb (diff)
downloadqt-creator-93ce31ebb631cd9cd0d44c04c1b456db8a2e6d02.tar.gz
QmlDesigner: Remove dead code
Killed by a7a29fa6d6341ac6afd8e8b49f7c24fa06477fd1 Change-Id: If2952d5904b9c688387d1f904cb1b9a8e819d7f7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index ddc8cefe97..4c58c15dc1 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -208,11 +208,8 @@ QString QmlObjectNode::stripedTranslatableText(const PropertyName &name) const
if (regularExpressionPatter.exactMatch(modelNode().bindingProperty(name).expression()))
return regularExpressionPatter.cap(2);
return instanceValue(name).toString();
- } else {
- return modelNode().variantProperty(name).value().toString();
}
-
- return QString();
+ return modelNode().variantProperty(name).value().toString();
}
QString QmlObjectNode::expression(const PropertyName &name) const