diff options
| -rw-r--r-- | src/scanner.l | 17 | ||||
| -rw-r--r-- | tmake/lib/linux-g++/tmake.conf | 2 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/scanner.l b/src/scanner.l index 66ea314..f0067b0 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -4962,6 +4962,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) //addToBody(yytext); ++curlyCount ; } +<SkipCurly>"}"/{BN}*("/*!"|"/**"|"//!"|"///")"<!--" | /* see bug710917 */ <SkipCurly>"}" { //addToBody(yytext); if( curlyCount ) @@ -4970,22 +4971,6 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } else { -#if 0 - if (!Config_getBool("HIDE_IN_BODY_DOCS") && - !current->doc.isEmpty()) - { - // copy documentation found inside the body - // to the previous item - if (previous->inbodyLine==-1) - { - previous->inbodyLine = current->docLine; - previous->inbodyFile = current->docFile; - } - //printf("*** inbodyDocs+=%s\n",current->doc.data()); - previous->inbodyDocs += current->doc; - current->doc.resize(0); - } -#endif if (current->sli && previous) // copy special list items { QListIterator<ListItemInfo> li(*current->sli); diff --git a/tmake/lib/linux-g++/tmake.conf b/tmake/lib/linux-g++/tmake.conf index 0378239..193fadd 100644 --- a/tmake/lib/linux-g++/tmake.conf +++ b/tmake/lib/linux-g++/tmake.conf @@ -8,7 +8,7 @@ TEMPLATE = app CONFIG = qt warn_on release TMAKE_CC = gcc -TMAKE_CFLAGS = -pipe +TMAKE_CFLAGS = -pipe -fsigned-char TMAKE_CFLAGS_WARN_ON = -Wall -W TMAKE_CFLAGS_WARN_OFF = TMAKE_CFLAGS_RELEASE = -O2 |