summaryrefslogtreecommitdiffstats
path: root/src/tools/moc/collectjson.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Moc Sort json file list in collectjsonLeander Beernaert2019-11-271-1/+3
| | | | | | | | | This patch ensures that the list of input files are sorted before being collected. This provides consistency when comparing results generated from the CMake port which do not have the same order as qmake. Change-Id: I46e3acf7c26dfd21fd0c1196bdeddf22acbf6ba5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add support for machine-readable JSON output to the MOCSimon Hausmann2019-10-041-0/+103
The --output-json parameter will make moc produce a .json file next to the regular output file. With --collect-json the .json files for a module can be merged into a single one. Task-number: QTBUG-68796 Change-Id: I0e8fb802d47bd22da219701a8df947973d4bd7b5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>