aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmltc
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-11-16 10:26:51 +0100
committerUlf Hermann <ulf.hermann@qt.io>2021-11-18 11:23:01 +0100
commitd1aade8efda4f59926ff60e7c53e8a941921d96e (patch)
treec428ce47ca29b05fe09ac4818ac71d4fefb7c785 /tools/qmltc
parent84b3e889b8a9b281be6c19f747e4d230163d3909 (diff)
Remove QQmlJSTypeResolver::Semantics
We only support dynamic semantics here. Task-number: QTBUG-98305 Change-Id: I520da912062917e40e5628d003558fe80b612948 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Diffstat (limited to 'tools/qmltc')
-rw-r--r--tools/qmltc/main.cpp8
-rw-r--r--tools/qmltc/qmltctyperesolver.h4
2 files changed, 4 insertions, 8 deletions
diff --git a/tools/qmltc/main.cpp b/tools/qmltc/main.cpp
index f8f4c984fa..1b48623e2d 100644
--- a/tools/qmltc/main.cpp
+++ b/tools/qmltc/main.cpp
@@ -172,12 +172,8 @@ int main(int argc, char **argv)
QQmlJSLogger logger(url, sourceCode, /* silent */ false);
setupLogger(logger);
QmltcVisitor visitor(&importer, &logger, implicitImportDirectory, qmltypesFiles);
- // Type resolving is only static here due the inability to resolve parent
- // properties dynamically (QTBUG-95530). Indirect type storage is used as
- // this is a current option in qmllint (it doesn't mean that it is correct
- // for the compiler).
- QmltcTypeResolver typeResolver { &importer, &document, QQmlJSTypeResolver::Indirect,
- QQmlJSTypeResolver::Static, &logger };
+ QmltcTypeResolver typeResolver {
+ &importer, &document, QQmlJSTypeResolver::Indirect, &logger };
typeResolver.init(visitor);
if (logger.hasWarnings() || logger.hasErrors())
return EXIT_FAILURE;
diff --git a/tools/qmltc/qmltctyperesolver.h b/tools/qmltc/qmltctyperesolver.h
index 243f16daff..4cf66c46da 100644
--- a/tools/qmltc/qmltctyperesolver.h
+++ b/tools/qmltc/qmltctyperesolver.h
@@ -40,8 +40,8 @@ class QmltcTypeResolver : public QQmlJSTypeResolver
{
public:
QmltcTypeResolver(QQmlJSImporter *importer, const QmlIR::Document *document,
- TypeStorage storage, Semantics semantics, QQmlJSLogger *logger)
- : QQmlJSTypeResolver(importer, document, storage, semantics, logger)
+ TypeStorage storage, QQmlJSLogger *logger)
+ : QQmlJSTypeResolver(importer, document, storage, logger)
{
}
};