diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/moc.cpp | 7 | ||||
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index f3bfcc3144..fd1d2155fc 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -870,7 +870,12 @@ void Moc::generate(FILE *out) findRequiredContainers(&classList[i], &requiredQtContainers); } - foreach (const QByteArray &qtContainer, requiredQtContainers) { + // after finding the containers, we sort them into a list to avoid + // non-deterministic behavior which may cause rebuilds unnecessarily. + QList<QByteArray> requiredContainerList = requiredQtContainers.toList(); + std::sort(requiredContainerList.begin(), requiredContainerList.end()); + + foreach (const QByteArray &qtContainer, requiredContainerList) { fprintf(out, "#include <QtCore/%s>\n", qtContainer.constData()); } diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 8afc1c749a..64c2e02a35 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -493,7 +493,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark else if (atom->string() == "classes") { generateCompactList(Generic, relative, qdb_->getCppClasses(), true); } - else if (atom->string() == "qmlclasses") { + else if (atom->string() == "qmltypes") { generateCompactList(Generic, relative, qdb_->getQmlTypes(), true); } else if (atom->string().contains("classesbymodule")) { |