2 files changed, 14 insertions, 24 deletions
diff --git a/sources/pyside-tools/deploy_lib/commands.py b/sources/pyside-tools/deploy_lib/commands.py
index 8c017051d..03f8c20f8 100644
--- a/sources/pyside-tools/deploy_lib/commands.py
+++ b/sources/pyside-tools/deploy_lib/commands.py
@@ -5,10 +5,9 @@ from __future__ import annotations
 import json
 import subprocess
 import sys
-import shutil
-import tempfile
 from pathlib import Path
 from functools import lru_cache
+from . import DEFAULT_IGNORE_DIRS
 
 
 """
@@ -42,31 +41,23 @@ def run_command(command, dry_run: bool, fetch_output: bool = False):
 
 
 @lru_cache
-def run_qmlimportscanner(qml_files: tuple[Path], dry_run: bool):
+def run_qmlimportscanner(project_dir: Path, dry_run: bool):
     """
         Runs pyside6-qmlimportscanner to find all the imported qml modules in project_dir
     """
     qml_modules = []
-    # Create a temporary directory to copy all the .qml_files
-    # TODO: Modify qmlimportscanner code in qtdeclarative to include a flag to ignore directories
-    # Then, this copy into a temporary directory can be avoided
-    # See 36b425ea8bf36d47694ea69fa7d129b6d5a2ca2d in gerrit
-    with tempfile.TemporaryDirectory() as temp_dir:
-        temp_path = Path(temp_dir)
-        # Copy only files with .qml suffix
-        for qml_file in qml_files:
-            if qml_file.suffix == ".qml":
-                shutil.copy2(qml_file.resolve(), temp_path / qml_file.name)
+    cmd = ["pyside6-qmlimportscanner", "-rootPath", str(project_dir)]
 
-        cmd = ["pyside6-qmlimportscanner", "-rootPath", str(temp_path)]
+    for ignore_dir in DEFAULT_IGNORE_DIRS:
+        cmd.extend(["-exclude", ignore_dir])
 
-        if dry_run:
-            run_command(command=cmd, dry_run=True)
+    if dry_run:
+        run_command(command=cmd, dry_run=True)
 
-        # Run qmlimportscanner during dry_run as well to complete the command being run by nuitka
-        _, json_string = run_command(command=cmd, dry_run=False, fetch_output=True)
-        json_string = json_string.decode("utf-8")
-        json_array = json.loads(json_string)
-        qml_modules = [item['name'] for item in json_array if item['type'] == "module"]
+    # Run qmlimportscanner during dry_run as well to complete the command being run by nuitka
+    _, json_string = run_command(command=cmd, dry_run=False, fetch_output=True)
+    json_string = json_string.decode("utf-8")
+    json_array = json.loads(json_string)
+    qml_modules = [item['name'] for item in json_array if item['type'] == "module"]
 
     return qml_modules
diff --git a/sources/pyside-tools/deploy_lib/config.py b/sources/pyside-tools/deploy_lib/config.py
index d51df7478..de19b0a1d 100644
--- a/sources/pyside-tools/deploy_lib/config.py
+++ b/sources/pyside-tools/deploy_lib/config.py
@@ -333,8 +333,7 @@ class Config(BaseConfig):
     def _find_excluded_qml_plugins(self) -> set:
         excluded_qml_plugins = None
         if self.qml_files:
-            self.qml_modules = set(run_qmlimportscanner(qml_files=tuple(self.qml_files),
-                                                        # tuple is needed to make it hashable
+            self.qml_modules = set(run_qmlimportscanner(project_dir=self.project_dir,
                                                         dry_run=self.dry_run))
             excluded_qml_plugins = EXCLUDED_QML_PLUGINS.difference(self.qml_modules)
 
@@ -364,7 +363,7 @@ class Config(BaseConfig):
         """
         extra_modules = []
         if not self.qml_modules and self.qml_files:
-            self.qml_modules = set(run_qmlimportscanner(qml_files=self.qml_files,
+            self.qml_modules = set(run_qmlimportscanner(project_dir=self.project_dir,
                                                         dry_run=self.dry_run))
 
         if "QtQuick" in self.qml_modules: