summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-02-08 19:19:38 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-02-08 19:21:47 (GMT)
commitdeb0f3c17bcbdf4565eb7652ca4ed086f0938bfe (patch)
tree58685d3479e73591085e1ac22156b582fb628a3c /tools/qdoc3
parentf2ba5e4d83f112f14a08e65e032497754750e8fa (diff)
downloadQt-deb0f3c17bcbdf4565eb7652ca4ed086f0938bfe.zip
Qt-deb0f3c17bcbdf4565eb7652ca4ed086f0938bfe.tar.gz
Qt-deb0f3c17bcbdf4565eb7652ca4ed086f0938bfe.tar.bz2
Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.
We now write UTF-8 encoded XHTML and assume all pure documentation which isn't pure ASCII is now UTF-8 encoded. Reviewed-by: Trust Me
Diffstat (limited to 'tools/qdoc3')
-rw-r--r--tools/qdoc3/test/qt-build-docs.qdocconf9
-rw-r--r--tools/qdoc3/test/qt.qdocconf9
2 files changed, 14 insertions, 4 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index dae5ca1..4f1ae5d 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -8,6 +8,10 @@ project = Qt
description = Qt Reference Documentation
url = http://qt.nokia.com/doc/4.7
+sourceencoding = UTF-8
+outputencoding = UTF-8
+naturallanguage = en_US
+
edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript \
QtScriptTools QtSql QtSvg QtWebKit QtXml QtXmlPatterns \
Qt3Support QtHelp QtDesigner QtAssistant QAxContainer Phonon \
@@ -90,12 +94,13 @@ excludedirs = $QT_SOURCE_TREE/src/3rdparty/clucene \
$QT_SOURCE_TREE/src/3rdparty/webkit/WebCore \
$QT_SOURCE_TREE/src/3rdparty/wintab \
$QT_SOURCE_TREE/src/3rdparty/zlib \
- $QT_SOURCE_TREE/doc/src/snippets \
$QT_SOURCE_TREE/src/3rdparty/phonon/gstreamer \
$QT_SOURCE_TREE/src/3rdparty/phonon/ds9 \
$QT_SOURCE_TREE/src/3rdparty/phonon/qt7 \
$QT_SOURCE_TREE/src/3rdparty/phonon/mmf \
- $QT_SOURCE_TREE/src/3rdparty/phonon/waveout
+ $QT_SOURCE_TREE/src/3rdparty/phonon/waveout \
+ $QT_SOURCE_TREE/doc/src/snippets \
+ $QT_SOURCE_TREE/doc/src/zh_CN
sources.fileextensions = "*.cpp *.qdoc *.mm"
examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 4dfabcf..1039c18 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -10,6 +10,10 @@ version = %VERSION%
description = Qt Reference Documentation
url = http://qt.nokia.com/doc/4.7
+sourceencoding = UTF-8
+outputencoding = UTF-8
+naturallanguage = en_US
+
edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript \
QtScriptTools QtSql QtSvg QtWebKit QtXml QtXmlPatterns \
Qt3Support QtHelp QtDesigner QtAssistant QAxContainer Phonon \
@@ -91,12 +95,13 @@ excludedirs = $QTDIR/src/3rdparty/clucene \
$QTDIR/src/3rdparty/webkit/WebCore \
$QTDIR/src/3rdparty/wintab \
$QTDIR/src/3rdparty/zlib \
- $QTDIR/doc/src/snippets \
$QTDIR/src/3rdparty/phonon/gstreamer \
$QTDIR/src/3rdparty/phonon/ds9 \
$QTDIR/src/3rdparty/phonon/qt7 \
$QTDIR/src/3rdparty/phonon/mmf \
- $QTDIR/src/3rdparty/phonon/waveout
+ $QTDIR/src/3rdparty/phonon/waveout \
+ $QTDIR/doc/src/snippets \
+ $QTDIR/doc/src/zh_CN
sources.fileextensions = "*.cpp *.qdoc *.mm"
examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"