diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2013-06-11 00:29:41 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-30 00:48:34 +0200 |
| commit | fbcd6a29c1a79a94bfb7c3b4e56ba167c7109d99 (patch) | |
| tree | 211d73a1a496b15b844505567aafa4fcd8eae38a /src | |
| parent | f62c92ba843d0d6f9bdd04f8ccc3b08cada0e1ec (diff) | |
moc: Avoid non-deterministic output which causes unnecesary rebuilds
Change-Id: I4fdd2b37869ed73ede3a33b5adad94413bd43b01
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/moc/moc.cpp | 7 |
1 files changed, 6 insertions, 1 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()); } |