Merge QML specific qdoc changes

Reviewed-by: Martin Smith

1 files changed, 15 insertions, 0 deletions

diff --git a/tools/qdoc3/cppcodeparser.h b/tools/qdoc3/cppcodeparser.h
index 1f4131894d..cbb01498fc 100644
--- a/tools/qdoc3/cppcodeparser.h
+++ b/tools/qdoc3/cppcodeparser.h
@@ -90,6 +90,21 @@ class CppCodeParser : public CodeParser
     virtual Node *processTopicCommand(const Doc& doc, 
                                       const QString& command,
                                       const QString& arg);
+#ifdef QDOC_QML    
+    // might need to implement this in QsCodeParser as well.
+    virtual Node *processTopicCommandGroup(const Doc& doc,
+                                           const QString& command,
+                                           const QStringList& args);
+    bool splitQmlPropertyArg(const Doc& doc,
+                             const QString& arg,
+                             QString& type,
+                             QString& element,
+                             QString& property);
+    bool splitQmlArg(const Doc& doc,
+                     const QString& arg,
+                     QString& element,
+                     QString& name);
+#endif
     virtual QSet<QString> otherMetaCommands();
     virtual void processOtherMetaCommand(const Doc& doc,
                                          const QString& command,