Commit 392b48a2 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 734245 - Q_PROPERTY switches the member access from private to public

parent c3ddf333
...@@ -2245,7 +2245,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) ...@@ -2245,7 +2245,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
<FindMembers>"Q_OBJECT" { // Qt object macro <FindMembers>"Q_OBJECT" { // Qt object macro
} }
<FindMembers>"Q_PROPERTY" { // Qt property declaration <FindMembers>"Q_PROPERTY" { // Qt property declaration
current->protection = protection = Public ; //current->protection = protection = Public ; // see bug734245
current->mtype = mtype = Property; current->mtype = mtype = Property;
current->type.resize(0); current->type.resize(0);
BEGIN(QtPropType); BEGIN(QtPropType);
...@@ -3372,6 +3372,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) ...@@ -3372,6 +3372,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
} }
else else
{ {
mtype = Method;
virt = Normal;
if (needNewCurrent) if (needNewCurrent)
{ {
current = new Entry ; current = new Entry ;
...@@ -6126,6 +6128,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) ...@@ -6126,6 +6128,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
else else
{ {
mtype = Method; mtype = Method;
virt = Normal;
unput(';'); unput(';');
BEGIN(FindMembers); BEGIN(FindMembers);
} }
......
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