Commit 109ce566 authored by Eike Ziller's avatar Eike Ziller
Browse files

Modeling: Fix merge issue



Change-Id: Id1a398fdaa68c3515f21908164c1b84616a8afc2
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent 3f636350
......@@ -490,7 +490,7 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok)
member.setProperties(member.properties() | MClassMember::PropertyQslot);
word = cursor.readWord().toLower();
} else if (word == QStringLiteral("invokable") || word == QStringLiteral("qInvokable")) {
member.setProperties(member.getProperties() | MClassMember::PROPERTY_QINVOKABLE);
member.setProperties(member.properties() | MClassMember::PropertyQinvokable);
word = cursor.readWord().toLower();
} else if (word == QStringLiteral(":")) {
word = cursor.readWord().toLower();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment