tools: Remove QmlJSImporter::m_currentDir

It was only used to make paths passed to importFileOrDirectory absolute.
We can do that before passing them.

Change-Id: I0798d38080596fc6eb314259e81702b81a7743dd
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 1 insertions, 6 deletions

diff --git a/tools/shared/qmljsimporter.cpp b/tools/shared/qmljsimporter.cpp
index 28b7e7950f..b061b96a53 100644
--- a/tools/shared/qmljsimporter.cpp
+++ b/tools/shared/qmljsimporter.cpp
@@ -287,9 +287,6 @@ QmlJSImporter::ImportedTypes QmlJSImporter::importFileOrDirectory(
 
     QString name = fileOrDirectory;
 
-    if (QFileInfo(name).isRelative())
-        name = QDir(m_currentDir).filePath(name);
-
     QFileInfo fileInfo(name);
     if (fileInfo.isFile()) {
         ScopeTree::Ptr scope(localFile2ScopeTree(fileInfo.canonicalFilePath()));
diff --git a/tools/shared/qmljsimporter.h b/tools/shared/qmljsimporter.h
index 44536acc51..170b211175 100644
--- a/tools/shared/qmljsimporter.h
+++ b/tools/shared/qmljsimporter.h
@@ -57,8 +57,7 @@ public:
         QHash<QString, ScopeTree::Ptr> importedQmlNames;
     };
 
-    QmlJSImporter(const QString &currentDir, const QStringList &importPaths) :
-        m_currentDir(currentDir), m_importPaths(importPaths) {}
+    QmlJSImporter(const QStringList &importPaths) : m_importPaths(importPaths) {}
 
     ImportedTypes importBaseQmlTypes(const QStringList &qmltypesFiles);
     ImportedTypes importFileOrDirectory(
@@ -95,7 +94,6 @@ private:
     Import readQmldir(const QString &dirname);
     ScopeTree::Ptr localFile2ScopeTree(const QString &filePath);
 
-    QString m_currentDir;
     QStringList m_importPaths;
     QHash<QPair<QString, QTypeRevision>, Import> m_seenImports;
     QHash<QString, ScopeTree::Ptr> m_importedFiles;