From 109ce5663a59215103bef5dff91bc31cad1856e2 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Mon, 23 Nov 2015 14:31:08 +0100
Subject: [PATCH] Modeling: Fix merge issue

Change-Id: Id1a398fdaa68c3515f21908164c1b84616a8afc2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 .../3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
index bb8d11ebdd9..db6b44f78ee 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
@@ -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();