qdoc: Added support for different source and output character encodings.

Previously, qdoc assumed Latin1 (ISO-8859-1) for source code and other
documentation, and wrote out XHTML with the same encoding. This change
adds additional configuration options (sourceencoding, outputencoding,
naturallanguage) that enable translated documentation in non-Latin1
encodings to be built with qdoc.

To be reviewed before merge into the master branch.

Reviewed-by: Trust Me

1 files changed, 6 insertions, 0 deletions

diff --git a/tools/qdoc3/pagegenerator.h b/tools/qdoc3/pagegenerator.h
index db24eddd60..20a6c3c98b 100644
--- a/tools/qdoc3/pagegenerator.h
+++ b/tools/qdoc3/pagegenerator.h
@@ -54,6 +54,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QTextCodec;
+
 class ClassNode;
 class InnerNode;
 class NamespaceNode;
@@ -76,6 +78,10 @@ class PageGenerator : public Generator
     virtual void generateInnerNode(const InnerNode *node, CodeMarker *marker);
     QTextStream& out();
 
+    QString naturalLanguage;
+    QString outputEncoding;
+    QTextCodec *outputCodec;
+
  private:
     QStack<QTextStream *> outStreamStack;
 };