diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-08-15 09:05:26 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-08-15 09:05:26 (GMT) |
| commit | 392b48a25e4315528fbb11a5a1bfc9f2bca791c0 (patch) | |
| tree | b52c540d1b87c3c7ae28c1930bc73322ed368aae | |
| parent | c3ddf3331239fb3f41e502a8337eee786ceaad06 (diff) | |
| download | Doxygen-392b48a25e4315528fbb11a5a1bfc9f2bca791c0.zip Doxygen-392b48a25e4315528fbb11a5a1bfc9f2bca791c0.tar.gz Doxygen-392b48a25e4315528fbb11a5a1bfc9f2bca791c0.tar.bz2 | |
Bug 734245 - Q_PROPERTY switches the member access from private to public
| -rw-r--r-- | src/scanner.l | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/scanner.l b/src/scanner.l index 5b698cc..8370f13 100644 --- a/src/scanner.l +++ b/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); } |