aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2018-08-22 12:02:08 +0200
committerTim Jenssen <tim.jenssen@qt.io>2018-08-22 11:07:27 +0000
commit957035155dcb5aaaca9b0d0db56431899dabfe98 (patch)
tree75becb459ae660b17f639efca9e5ba9d42cfc258
parent336ea19b17b9ca4eda904c7a9443a2799a18cd74 (diff)
QmlDesigner: Fix infinite loop if no prefix for id is provided
If the prefix was empty the id would never become valid. Use "element" as a default prefix. Task-number: QDS-204 Change-Id: I01e4afd1e0da7bcada69a0c621bbe483f4098b90 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
-rw-r--r--src/plugins/qmldesigner/designercore/model/abstractview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
index 9c4b768535..413492a121 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
@@ -489,6 +489,8 @@ QString firstCharToLower(const QString &string)
QString AbstractView::generateNewId(const QString &prefixName) const
{
+ if (ModelNode::isValidId(prefixName))
+ return generateNewId("element");
int counter = 1;
/* First try just the prefixName without number as postfix, then continue with 2 and further as postfix