diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-07 14:14:35 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-07 15:17:20 +0100 |
| commit | 6f1618e13830c55de70a1bd45062d7f407343b27 (patch) | |
| tree | 9f40d1a1ccafb3300d039ce0bb8242d7ac812cc0 | |
| parent | 9d9c5a786c1c3c5986461fc9d885ca7c5ef06b83 (diff) | |
qmltyperegistrar: Improve formatting of includes
We always need qqml.h and qqmlmoduleregistration.h. Put those in front
and sort and deduplicate the module-dependent imports.
Change-Id: Idae435939e7a69dd706c928b01b159334c21cff1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/qmltyperegistrar/qmltyperegistrar.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/qmltyperegistrar/qmltyperegistrar.cpp b/src/qmltyperegistrar/qmltyperegistrar.cpp index 85a94e9d46..49c9fccb66 100644 --- a/src/qmltyperegistrar/qmltyperegistrar.cpp +++ b/src/qmltyperegistrar/qmltyperegistrar.cpp @@ -255,7 +255,8 @@ int main(int argc, char **argv) "** WARNING! All changes made in this file will be lost!\n" "*****************************************************************************/\n\n"); fprintf(output, - "#include <QtQml/qqmlengine.h>\n"); + "#include <QtQml/qqml.h>\n" + "#include <QtQml/qqmlmoduleregistration.h>\n"); QStringList includes; QVector<QJsonObject> types; @@ -332,7 +333,10 @@ int main(int argc, char **argv) sortTypes(types); - fprintf(output, "\n#include <QtQml/qqmlmoduleregistration.h>"); + std::sort(includes.begin(), includes.end()); + const auto newEnd = std::unique(includes.begin(), includes.end()); + includes.erase(newEnd, includes.end()); + const bool privateIncludes = parser.isSet(privateIncludesOption); for (const QString &include : qAsConst(includes)) { if (privateIncludes && include.endsWith(QLatin1String("_p.h"))) |