diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-24 15:12:24 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-24 15:12:24 (GMT) |
| commit | 0d967b97262170eb48b4ce4d57d12d6c77aae8aa (patch) | |
| tree | 4ef73f73a3c0bafe305f2ded1660cde52405c974 /tools | |
| parent | 3d769613d5efc642ebfd8d5fe7c149834132fe65 (diff) | |
| parent | 57f2890a28f5bed8476019d4f280e75e982cfe25 (diff) | |
| download | Qt-0d967b97262170eb48b4ce4d57d12d6c77aae8aa.zip Qt-0d967b97262170eb48b4ce4d57d12d6c77aae8aa.tar.gz Qt-0d967b97262170eb48b4ce4d57d12d6c77aae8aa.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/pagegenerator.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index e9566ee..89ec6fe 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.cpp @@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE Nothing to do in the constructor. */ PageGenerator::PageGenerator() + : outputCodec(0) { // nothing. } @@ -294,7 +295,9 @@ void PageGenerator::beginSubPage(const Location& location, if (!outFile->open(QFile::WriteOnly)) location.fatal(tr("Cannot open output file '%1'").arg(outFile->fileName())); QTextStream* out = new QTextStream(outFile); - out->setCodec(outputCodec); + + if (outputCodec) + out->setCodec(outputCodec); outStreamStack.push(out); } |