From cdd2300122eb50bb7161b0511b603ddca05ea7c9 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 10 Jun 2025 13:58:13 +0200 Subject: QtQml: Move URL normalization to QQmlMetaType We need it in many places and it's better to have it next to equalBaseUrls(). Also, it can be inline there. Change-Id: Ie83ad7a345a25a67f418c6cf9886ba8116f7a762 Reviewed-by: Fabian Kosmale --- src/qml/jsruntime/qv4engine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/jsruntime/qv4engine.cpp') diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 684c36a094..82e653a645 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -2149,8 +2149,8 @@ ExecutionEngine::Module doFindModule( const QUrl &url, const ExecutableCompilationUnit *referrer, NotFound &¬Found) { const QUrl resolved = referrer - ? referrer->finalUrl().resolved(QQmlTypeLoader::normalize(url)) - : QQmlTypeLoader::normalize(url); + ? referrer->finalUrl().resolved(QQmlMetaType::normalizedUrl(url)) + : QQmlMetaType::normalizedUrl(url); auto existingModule = compilationUnits.constFind(resolved); if (existingModule != compilationUnits.constEnd()) return *existingModule; -- cgit v1.2.3