summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-12-07 12:20:15 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-12-07 12:39:13 +0000
commit5f3e01d675a9a5345d435961ac817f57dd47a347 (patch)
tree4989fd65e78fe8ccd56edf8df9ed674b27a14385
parent70c2b885c5d843b5a956d57c3ee4682c6684f40b (diff)
Skip import of asset where source and target asset is the same file
Task-number: QT3DS-2832 Change-Id: I3f82a94a68684d53cc840b71f96f6f2bdff6ddc7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp
index 24d24f1b..394250dd 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp
+++ b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp
@@ -248,6 +248,8 @@ void ProjectFileSystemModel::overridableCopyFile(const QString &srcFile, const Q
QFileInfo srcFileInfo(srcFile);
if (srcFileInfo.exists() && addUniqueImportFile(srcFile, outImportedFiles)) {
QFileInfo targetFileInfo(targetFile);
+ if (srcFileInfo == targetFileInfo)
+ return; // Autoskip when source and target is the same
if (!targetFileInfo.dir().exists())
targetFileInfo.dir().mkpath(QStringLiteral("."));