diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-11-18 14:24:12 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-11-26 11:57:57 +0100 |
commit | 17bfd9c69467f2e7e426674d8d9fc4b9112e852d (patch) | |
tree | bca2edde54abcae6a5719d7fe814c42e09016f6a /tools | |
parent | cb3ec010fff39a9b5b35b1afb3af478cf118c3ca (diff) |
QmlCompiler: Tighten the constness of various method parameters
The compile passes shouldn't need to change the document, AST, or IR. At
least not accidentally. We might add interfaces to explicitly modify
things later. As a side effect, you can now use one instance of
QQmlJSTypeResolver for multiple documents by re-init()'ing it.
Change-Id: Ic3544b3ddedd30d7f8d00b1df9cee3e6292ca7de
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qmltc/main.cpp | 3 | ||||
-rw-r--r-- | tools/qmltc/qmltctyperesolver.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/qmltc/main.cpp b/tools/qmltc/main.cpp index d749b91c35..941685fb5d 100644 --- a/tools/qmltc/main.cpp +++ b/tools/qmltc/main.cpp @@ -173,8 +173,9 @@ int main(int argc, char **argv) QQmlJSLogger logger(url, sourceCode, /* silent */ false); setupLogger(logger); QmltcVisitor visitor(&importer, &logger, implicitImportDirectory, qmltypesFiles); - QmltcTypeResolver typeResolver { &importer, &logger }; + QmltcTypeResolver typeResolver { &importer }; typeResolver.init(&visitor, document.program); + if (logger.hasWarnings() || logger.hasErrors()) return EXIT_FAILURE; diff --git a/tools/qmltc/qmltctyperesolver.h b/tools/qmltc/qmltctyperesolver.h index 2be59d9087..495f78b81d 100644 --- a/tools/qmltc/qmltctyperesolver.h +++ b/tools/qmltc/qmltctyperesolver.h @@ -39,10 +39,7 @@ QT_BEGIN_NAMESPACE class QmltcTypeResolver : public QQmlJSTypeResolver { public: - QmltcTypeResolver(QQmlJSImporter *importer, QQmlJSLogger *logger) - : QQmlJSTypeResolver(importer, logger) - { - } + QmltcTypeResolver(QQmlJSImporter *importer) : QQmlJSTypeResolver(importer) {} }; QT_END_NAMESPACE |