diff --git a/src/plugins/qmldesigner/core/model/modelnode.cpp b/src/plugins/qmldesigner/core/model/modelnode.cpp index 600977f606d5882a4ac29fe4806bb38c7491be7b..6fb91ea9b9bf239008f2cb203b99eeabad90b7a9 100644 --- a/src/plugins/qmldesigner/core/model/modelnode.cpp +++ b/src/plugins/qmldesigner/core/model/modelnode.cpp @@ -169,7 +169,7 @@ static bool idContainsWrongLetter(const QString& id) bool ModelNode::isValidId(const QString &id) { - return !(id.isEmpty() || idContainsWrongLetter(id)); + return id.isEmpty() || !idContainsWrongLetter(id); } void ModelNode::setId(const QString& id) diff --git a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp index b1a2fda3373df2a1d10b744da506958ac1e1ddf1..f3e0d57fbe3df1268f3edd75ebd6d39a9a4982dc 100644 --- a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp @@ -114,7 +114,7 @@ bool TextToModelMerger::load(const QByteArray &data, DifferenceHandler &differen setActive(false); - throw; + return false; } }