Permalink
Browse files

Bug 734245 - Q_PROPERTY switches the member access from private to pu…

…blic
  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Aug 15, 2014
1 parent c3ddf33 commit 392b48a25e4315528fbb11a5a1bfc9f2bca791c0
Showing with 4 additions and 1 deletion.
  1. +4 −1 src/scanner.l
@@ -2245,7 +2245,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
<FindMembers>"Q_OBJECT" { // Qt object macro
}
<FindMembers>"Q_PROPERTY" { // Qt property declaration
current->protection = protection = Public ;
//current->protection = protection = Public ; // see bug734245
current->mtype = mtype = Property;
current->type.resize(0);
BEGIN(QtPropType);
@@ -3372,6 +3372,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
else
{
mtype = Method;
virt = Normal;
if (needNewCurrent)
{
current = new Entry ;
@@ -6126,6 +6128,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
else
{
mtype = Method;
virt = Normal;
unput(';');
BEGIN(FindMembers);
}

0 comments on commit 392b48a

Please sign in to comment.