diff options
| author | Olivier De Cannière <olivier.decanniere@qt.io> | 2024-10-14 12:31:16 +0200 |
|---|---|---|
| committer | Olivier De Cannière <olivier.decanniere@qt.io> | 2024-10-31 11:49:54 +0100 |
| commit | 660fc8fb7d1976f5f10fbf6381e7f372f71e0f59 (patch) | |
| tree | 7258c3c88085968e4b13b3d684bbde6f98100b64 /src/qmlcompiler/qqmljsimportvisitor.cpp | |
| parent | 00f58f2eca6bfcc66dcc79c249e51d2d34eb6a11 (diff) | |
QmlCompiler: Rename QQmlJSLogger's fileName to filePath
This is done in prepartion for the following patch in the chain.
Pick-to: 6.8
Change-Id: If8ce75be8ba00e7e4cdd5a0f5e66319ab0d36755
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmlcompiler/qqmljsimportvisitor.cpp')
| -rw-r--r-- | src/qmlcompiler/qqmljsimportvisitor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qmlcompiler/qqmljsimportvisitor.cpp b/src/qmlcompiler/qqmljsimportvisitor.cpp index 56f522bed6..1ffbe8d7d2 100644 --- a/src/qmlcompiler/qqmljsimportvisitor.cpp +++ b/src/qmlcompiler/qqmljsimportvisitor.cpp @@ -177,7 +177,7 @@ void QQmlJSImportVisitor::populateCurrentScope( m_currentScope->setScopeType(type); setScopeName(m_currentScope, type, name); m_currentScope->setIsComposite(true); - m_currentScope->setFilePath(QFileInfo(m_logger->fileName()).absoluteFilePath()); + m_currentScope->setFilePath(QFileInfo(m_logger->filePath()).absoluteFilePath()); m_currentScope->setSourceLocation(location); m_scopesByIrLocation.insert({ location.startLine, location.startColumn }, m_currentScope); } @@ -417,7 +417,7 @@ void QQmlJSImportVisitor::importBaseModules() // Pulling in the modules and neighboring qml files of the qmltypes we're trying to lint is not // something we need to do. - if (!m_logger->fileName().endsWith(u".qmltypes"_s)) { + if (!m_logger->filePath().endsWith(u".qmltypes"_s)) { m_rootScopeImports.add(m_importer->importDirectory(m_implicitImportDirectory)); // Import all possible resource directories the file may belong to. @@ -425,7 +425,7 @@ void QQmlJSImportVisitor::importBaseModules() // locations, you're on your own anyway. if (QQmlJSResourceFileMapper *mapper = m_importer->resourceFileMapper()) { const QStringList resourcePaths = mapper->resourcePaths(QQmlJSResourceFileMapper::Filter { - m_logger->fileName(), QStringList(), QQmlJSResourceFileMapper::Resource }); + m_logger->filePath(), QStringList(), QQmlJSResourceFileMapper::Resource }); for (const QString &path : resourcePaths) { const qsizetype lastSlash = path.lastIndexOf(QLatin1Char('/')); if (lastSlash == -1) |