diff options
| author | Martin Smith <martin.smith@nokia.com> | 2012-06-28 10:46:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-28 12:35:14 +0200 |
| commit | ba892305960b37846ee49a90c5684aa8dbfd3d72 (patch) | |
| tree | 1e4d6da961448ef7d9d155421c3d5dc4a3a7aa6c /src/tools/qdoc/generator.cpp | |
| parent | a85759f07799ca57ffb436f103b863073cee315c (diff) | |
qdoc: Report multiple topic commands as an error
Some documenters are using two topic commands in a single qdoc
comment. This is only allowed for \qmlproperty so that multiple QML
properties can be documented with a single comment. qdoc now reports
an error for all other combinations of multiple topic commands.
Task Nr: QTBUG-26345
Change-Id: I1f9a6d2502ccffa76c2d41f961be3750014a0a56
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/generator.cpp')
| -rw-r--r-- | src/tools/qdoc/generator.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index 762f1156b23..ef46e4057f2 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -211,6 +211,25 @@ void Generator::appendSortedQmlNames(Text& text, } } +QMultiMap<QString,QString> outFileNames; + +/*! + For debugging qdoc. + */ +void Generator::writeOutFileNames() +{ + QFile* files = new QFile("/Users/msmith/depot/qt5/qtdoc/outputlist.txt"); + files->open(QFile::WriteOnly); + QTextStream* filesout = new QTextStream(files); + QMultiMap<QString,QString>::ConstIterator i = outFileNames.begin(); + while (i != outFileNames.end()) { + (*filesout) << i.key() << "\n"; + ++i; + } + filesout->flush(); + files->close(); +} + /*! Creates the file named \a fileName in the output directory. Attaches a QTextStream to the created file, which is written @@ -222,6 +241,7 @@ void Generator::beginSubPage(const InnerNode* node, const QString& fileName) if (!node->outputSubdirectory().isEmpty()) path += node->outputSubdirectory() + QLatin1Char('/'); path += fileName; + outFileNames.insert(fileName,fileName); QFile* outFile = new QFile(path); if (!outFile->open(QFile::WriteOnly)) node->location().fatal(tr("Cannot open output file '%1'").arg(outFile->fileName())); |