diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-02-05 19:08:54 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2021-02-05 19:08:54 (GMT) |
| commit | 4dcf39fb5b61d633ac3982011ace355ec1b27abc (patch) | |
| tree | 5cb9cea7a370693d1e6013144fd1b6c758c90d90 | |
| parent | 774ea08686e6fddd13dd905bee0b81c8833975da (diff) | |
| parent | 915cdfc986ba53fc138e4f6e1302acc9ba0d6381 (diff) | |
| download | Doxygen-4dcf39fb5b61d633ac3982011ace355ec1b27abc.zip Doxygen-4dcf39fb5b61d633ac3982011ace355ec1b27abc.tar.gz Doxygen-4dcf39fb5b61d633ac3982011ace355ec1b27abc.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rwxr-xr-x | addon/doxywizard/doxywizard.cpp | 4 | ||||
| -rw-r--r-- | addon/doxywizard/expert.cpp | 16 | ||||
| -rw-r--r-- | addon/doxywizard/inputstrlist.cpp | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp index f713025..5031221 100755 --- a/addon/doxywizard/doxywizard.cpp +++ b/addon/doxywizard/doxywizard.cpp @@ -553,7 +553,11 @@ void MainWindow::runDoxygen() m_runProcess->setEnvironment(env); QStringList args; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QStringList runOptions = m_runOptions->text().split(QLatin1Char(' '),Qt::SkipEmptyParts); +#else QStringList runOptions = m_runOptions->text().split(QLatin1Char(' '),QString::SkipEmptyParts); +#endif args << runOptions; args << QString::fromLatin1("-b"); // make stdout unbuffered diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp index 7fd7df3..a50ff2b 100644 --- a/addon/doxywizard/expert.cpp +++ b/addon/doxywizard/expert.cpp @@ -760,13 +760,13 @@ void Expert::saveTopic(QTextStream &t,QDomElement &elem,QTextCodec *codec, { if (!brief) { - t << endl; + t << "\n"; } if (!condensed) { - t << "#---------------------------------------------------------------------------" << endl; - t << "# " << elem.attribute(SA("docs")) << endl; - t << "#---------------------------------------------------------------------------" << endl; + t << "#---------------------------------------------------------------------------\n"; + t << "# " << elem.attribute(SA("docs")) << "\n"; + t << "#---------------------------------------------------------------------------\n"; } // write options... QDomElement childElem = elem.firstChildElement(); @@ -783,9 +783,9 @@ void Expert::saveTopic(QTextStream &t,QDomElement &elem,QTextCodec *codec, Input *option = i.value(); if (option && !brief) { - t << endl; + t << "\n"; t << convertToComment(option->templateDocs()); - t << endl; + t << "\n"; } bool toPrint = true; if (option && condensed) toPrint = !option->isDefault(); @@ -797,7 +797,7 @@ void Expert::saveTopic(QTextStream &t,QDomElement &elem,QTextCodec *codec, t << " "; option->writeValue(t,codec); } - t << endl; + t << "\n"; } } } @@ -808,7 +808,7 @@ void Expert::saveTopic(QTextStream &t,QDomElement &elem,QTextCodec *codec, bool Expert::writeConfig(QTextStream &t,bool brief, bool condensed) { // write global header - t << "# Doxyfile " << getDoxygenVersion() << endl << endl; + t << "# Doxyfile " << getDoxygenVersion() << "\n\n"; if (!brief && !condensed) { t << convertToComment(m_header); diff --git a/addon/doxywizard/inputstrlist.cpp b/addon/doxywizard/inputstrlist.cpp index cdc7d14..9d0bd66 100644 --- a/addon/doxywizard/inputstrlist.cpp +++ b/addon/doxywizard/inputstrlist.cpp @@ -250,7 +250,7 @@ void InputStrList::writeValue(QTextStream &t,QTextCodec *codec) { if (!first) { - t << " \\" << endl; + t << " \\\n"; t << " "; } first=false; |