From 787bbfaf1c99adb7e079145a544b94be87a24e80 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Wed, 23 Feb 2022 14:55:42 +0200
Subject: [PATCH] QmlDesigner: Fix path when importing a 3D model inside a
 component

Fixes: QDS-6319
Change-Id: Ia9dbdf9a2d32eaf996cca2ba84e89ca8111dab1c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../itemlibrary/itemlibraryassetimportdialog.cpp          | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
index 135eaaf5aaf..1f974419c79 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
@@ -128,11 +128,9 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog(
             importPaths = model->importPaths();
     }
 
-    QString targetDir = defaulTargetDirectory;
-
-    ProjectExplorer::Project *currentProject = ProjectExplorer::SessionManager::projectForFile(doc->fileName());
-    if (currentProject)
-        targetDir = currentProject->projectDirectory().toString();
+    QString targetDir = QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toString();
+    if (targetDir.isEmpty())
+        targetDir = defaulTargetDirectory;
 
     // Import is always done under known folder. The order of preference for folder is:
     // 1) An existing QUICK_3D_ASSETS_FOLDER under DEFAULT_ASSET_IMPORT_FOLDER project import path