diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-02-23 14:55:42 +0200 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-02-23 18:48:06 +0000 |
| commit | 787bbfaf1c99adb7e079145a544b94be87a24e80 (patch) | |
| tree | 1bec35f3a9e706591a40337344a09899b8fc8190 | |
| parent | 45364d43279ddc409e9def2e65b07a5129a2e9e2 (diff) | |
| download | qt-creator-787bbfaf1c99adb7e079145a544b94be87a24e80.tar.gz | |
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>
| -rw-r--r-- | src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp index 135eaaf5aa..1f974419c7 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 |