diff options
| author | Martin Smith <[email protected]> | 2012-10-25 12:44:16 +0200 |
|---|---|---|
| committer | Martin Smith <[email protected]> | 2012-10-25 13:04:31 +0200 |
| commit | 34d2a7e6b68cfff59c29018b4aea1a7af38512da (patch) | |
| tree | 64efb340de7340d3a7e914f65cfe719ed2aa98ae /src/tools/qdoc/qdocindexfiles.cpp | |
| parent | 600f2397b8d3d336b5d6faf8b49815641fe6f523 (diff) | |
qdoc: Don't load index in -prepare phase
qdoc was loading index files during the -prepare
phase, which it shouldn't do. The index files it
was loading were from modules other than the one
qdoc was running on. They had not been deleted
because qdoc only clears the output directory of
the module it is running on.
Also added a static function to the Location class
to print information messages on standard error.
This is useful to see what qdoc is doing and when
it is doing it because these log messages are
interleaved in the qdoc error messages. More of
these log messages will be added as needed.
Also removed some unneeded qDebug() stuff in
the code that processes the dependencies from
the qdocconf file.
Task number: QTBUG-27707
Change-Id: I1eec8d6ec89ff040969c2a1f62f21f551f347e05
Reviewed-by: Tor Arne Vestbø <[email protected]>
Diffstat (limited to 'src/tools/qdoc/qdocindexfiles.cpp')
| -rw-r--r-- | src/tools/qdoc/qdocindexfiles.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp index d68fe0e6fa1..6d697c61b0c 100644 --- a/src/tools/qdoc/qdocindexfiles.cpp +++ b/src/tools/qdoc/qdocindexfiles.cpp @@ -48,6 +48,7 @@ #include "location.h" #include "atom.h" #include "generator.h" +#include <qdebug.h> //include "doc.h" //include "htmlgenerator.h" @@ -109,8 +110,11 @@ void QDocIndexFiles::destroyQDocIndexFiles() */ void QDocIndexFiles::readIndexes(const QStringList& indexFiles) { - foreach (const QString& indexFile, indexFiles) + foreach (const QString& indexFile, indexFiles) { + QString msg = " Loading index file: " + indexFile; + Location::logToStdErr(msg); readIndexFile(indexFile); + } } /*! @@ -1048,6 +1052,9 @@ void QDocIndexFiles::generateIndex(const QString& fileName, if (!file.open(QFile::WriteOnly | QFile::Text)) return; + QString msg = " Writing index file: " + fileName; + Location::logToStdErr(msg); + gen_ = g; QXmlStreamWriter writer(&file); writer.setAutoFormatting(true); |
