diff --git a/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp index 04eac2cc3b1a44f0e667060f4ede477359d2fc99..be8ce3d31658732e868798b551534648fb2afd79 100644 --- a/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp +++ b/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp @@ -42,7 +42,7 @@ #include <QDebug> #define INDENT_DEPTH 4 -#define DUMP_REWRITE_ACTIONS +#undef DUMP_REWRITE_ACTIONS using namespace Qml; using namespace QmlDesigner; diff --git a/src/plugins/qmldesigner/core/model/rewriteaction.cpp b/src/plugins/qmldesigner/core/model/rewriteaction.cpp index 5e0c333ea6f1b2c076e04bcaa13c1ed7e0e31c0a..8cbc8c4ff221878e7848071bb5cf7d1a0d0c5605 100644 --- a/src/plugins/qmldesigner/core/model/rewriteaction.cpp +++ b/src/plugins/qmldesigner/core/model/rewriteaction.cpp @@ -53,9 +53,18 @@ bool AddPropertyRewriteAction::execute(QmlRefactoring &refactoring, ModelNodePos if (m_property.isDefaultProperty()) result = refactoring.addToObjectMemberList(nodeLocation, m_valueText); - else + else { result = refactoring.addProperty(nodeLocation, m_property.name(), m_valueText, m_propertyType); + if (!result) { + qDebug() << "*** AddPropertyRewriteAction::execute failed in addProperty(" + << nodeLocation << "," + << m_property.name() << "," + << m_valueText << ", ScriptBinding)" + << info(); + } + } + Q_ASSERT(result); return result; } @@ -71,9 +80,17 @@ bool ChangeIdRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, Mo static const QLatin1String idPropertyName("id"); bool result = false; - if (m_oldId.isEmpty()) + if (m_oldId.isEmpty()) { result = refactoring.addProperty(nodeLocation, idPropertyName, m_newId, QmlRefactoring::ScriptBinding); - else if (m_newId.isEmpty()) + + if (!result) { + qDebug() << "*** ChangeIdRewriteAction::execute failed in addProperty(" + << nodeLocation << "," + << idPropertyName << "," + << m_newId << ", ScriptBinding)" + << info(); + } + } else if (m_newId.isEmpty()) result = refactoring.removeProperty(nodeLocation, idPropertyName); else result = refactoring.changeProperty(nodeLocation, idPropertyName, m_newId, QmlRefactoring::ScriptBinding);