Added the foundations of QML markup support.

Use the QtDeclarative parser instead of Qt Creator's QML parser.
Split the QML visitor into documentation and markup visitors.
The code marker used for each file is now determined from its extension.

1 files changed, 3 insertions, 9 deletions

diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 2d3f034..ac1c5de 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -55,6 +55,7 @@
 #include "htmlgenerator.h"
 #include "plaincodemarker.h"
 #include "puredocparser.h"
+#include "qmlcodemarker.h"
 #include "qmlcodeparser.h"
 #include "tokenizer.h"
 #include "tree.h"
@@ -243,14 +244,6 @@ static void processQdocconfFile(const QString &fileName)
     Location outputFormatsLocation = config.lastLocation();
 
     /*
-      There must be a code marker for the source code language, e.g. C++.
-      If there isn't one, give up.
-     */
-    CodeMarker *marker = CodeMarker::markerForLanguage(lang);
-    if (!marker && !outputFormats.isEmpty())
-	langLocation.fatal(tr("Cannot output documentation for programming language '%1'").arg(lang));
-
-    /*
       Read some XML indexes containing definitions from other documentation sets.
      */
     QStringList indexFiles = config.getStringList(CONFIG_INDEXES);
@@ -334,7 +327,7 @@ static void processQdocconfFile(const QString &fileName)
         if (generator == 0)
             outputFormatsLocation.fatal(tr("Unknown output format '%1'")
                                         .arg(*of));
-        generator->generateTree(tree, marker);
+        generator->generateTree(tree);
         ++of;
     }
 
@@ -390,6 +383,7 @@ int main(int argc, char **argv)
      */
     PlainCodeMarker plainMarker;
     CppCodeMarker cppMarker;
+    QmlCodeMarker qmlMarker;
 
     HtmlGenerator htmlGenerator;
     DitaXmlGenerator ditaxmlGenerator;