diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/cppcodemarker.cpp | 4 | ||||
| -rw-r--r-- | tools/qdoc3/generator.cpp | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp index 22fe301..0f8d1b7 100644 --- a/tools/qdoc3/cppcodemarker.cpp +++ b/tools/qdoc3/cppcodemarker.cpp @@ -622,12 +622,8 @@ QList<Section> CppCodeMarker::sections(const InnerNode *inner, insert(staticPrivateMembers,*c,style,status); } else if ((*c)->type() == Node::Function) { -<<<<<<< HEAD:tools/qdoc3/cppcodemarker.cpp - insert(privateFunctions,*c,style,status); -======= if (!insertReimpFunc(privateFunctions,*c,status)) insert(privateFunctions, *c, style, status); ->>>>>>> 6c9647f6673fd5738001c5bbe416b116442fbc41:tools/qdoc3/cppcodemarker.cpp } else { insert(privateTypes,*c,style,status); diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp index d4a895b..b59c06d 100644 --- a/tools/qdoc3/generator.cpp +++ b/tools/qdoc3/generator.cpp @@ -276,7 +276,6 @@ bool Generator::generateText(const Text& text, } #ifdef QDOC_QML -<<<<<<< HEAD:tools/qdoc3/generator.cpp /*! Extract sections of markup text surrounded by \e qmltext and \e endqmltext and output them. |