feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Modeling: Fix merge issue

Browse Source 
Change-Id: Id1a398fdaa68c3515f21908164c1b84616a8afc2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-11-23 14:31:08 +01:00
parent 3f63635053
commit 109ce5663a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp vendored
View File

@@ -490,7 +490,7 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok)
member.setProperties(member.properties() | MClassMember::PropertyQslot); member.setProperties(member.properties() | MClassMember::PropertyQslot);
word = cursor.readWord().toLower(); word = cursor.readWord().toLower();
} else if (word == QStringLiteral("invokable") || word == QStringLiteral("qInvokable")) { } 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(); word = cursor.readWord().toLower();
} else if (word == QStringLiteral(":")) { } else if (word == QStringLiteral(":")) {
word = cursor.readWord().toLower(); word = cursor.readWord().toLower();