diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-04-04 20:48:14 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-04-04 20:48:14 (GMT) |
| commit | d7ce7981985c493241bf6b138b3bba69ce80d222 (patch) | |
| tree | e24e7a324ee94d401a9e36847e3e1b1fc676e68a /src/doxygen.cpp | |
| parent | f5e70723391bacc2d68c19d367ab414e70f786b4 (diff) | |
| parent | 9d631b571bcf1826d00287bb82d8aac2da0a55c8 (diff) | |
| download | Doxygen-d7ce7981985c493241bf6b138b3bba69ce80d222.zip Doxygen-d7ce7981985c493241bf6b138b3bba69ce80d222.tar.gz Doxygen-d7ce7981985c493241bf6b138b3bba69ce80d222.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src/doxygen.cpp')
| -rw-r--r-- | src/doxygen.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index d966738..0b5d58c 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -8726,9 +8726,8 @@ static void findMainPage(EntryNav *rootNav) { Entry *root = rootNav->entry(); warn(root->fileName,root->startLine, - "found more than one \\mainpage comment block! Skipping this " - "block." - ); + "found more than one \\mainpage comment block! (first occurrence: %s, line %d), Skipping current block!", + Doxygen::mainPage->docFile().data(),Doxygen::mainPage->docLine()); } rootNav->releaseEntry(); @@ -11673,7 +11672,7 @@ void generateOutput() QString oldDir = QDir::currentDirPath(); QDir::setCurrent(Config_getString("HTML_OUTPUT")); portable_sysTimerStart(); - if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", FALSE)) + if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))) { err("failed to run html help compiler on index.hhp\n"); } |