summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/UI
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-12-14 14:04:46 +0200
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-12-19 08:17:54 +0000
commit088f3a30cc092e7979dd4523a36711b1865d0d07 (patch)
tree9faf86addb2f33780ce37d88ba7f930294a187d8 /src/Authoring/Studio/UI
parent5a6b6c4bb84941df2c23901f4399bf3454fe8424 (diff)
Use original presentation id when importing a presentation
If an original presentation id can be resolved for an imported presentation, that will be used as the id instead of generating a new one. In case the id is a duplicate with an existing id, then a new one will be generated based on the file name. Task-number: QT3DS-2486 Change-Id: I1bf75fedfa9230a4f73271522800eaab02942ab4 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/UI')
-rw-r--r--src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp b/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp
index 527de1d0..36e344c3 100644
--- a/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp
+++ b/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp
@@ -181,7 +181,8 @@ bool CStudioProjectSettingsPage::onApply()
return false;
}
if (!g_StudioApp.GetCore()->getProjectFile()
- .isUniquePresentationId(m_ui->m_PresentationId->text())) {
+ .isUniquePresentationId(m_ui->m_PresentationId->text(),
+ g_StudioApp.GetCore()->GetDoc()->getRelativePath())) {
g_StudioApp.showPresentationIdUniqueWarning();
return false;
}