summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Client/Code/Core/Core
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-08-31 18:03:16 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-09-04 06:57:20 +0000
commit3ac8b4d150def7f0ce182f7b53523201478147d7 (patch)
treeecb71ed06cad3eb725f9c5e4fe64c4a5e90538fb /src/Authoring/Client/Code/Core/Core
parent478749a49cf1e320455a4c936a9b6c0e7e6c5288 (diff)
Allow opening non-project .uip files with editor
If .uia is not found, .uip is still opened and can be used. If something is done that needs to write to .uia, then .uia is created. Task-number: QT3DS-2178 Change-Id: If915c26da686d06f043e0409931971a707a434a2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Client/Code/Core/Core')
-rw-r--r--src/Authoring/Client/Code/Core/Core/Core.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Authoring/Client/Code/Core/Core/Core.cpp b/src/Authoring/Client/Code/Core/Core/Core.cpp
index 6c82b9ce..818c891f 100644
--- a/src/Authoring/Client/Code/Core/Core/Core.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Core.cpp
@@ -242,13 +242,11 @@ bool CCore::OnNewDocument(const Qt3DSFile &inDocument, bool isNewProject, bool s
CFilePath::CombineBaseAndRelative(theFinalDir, CFilePath(L"scripts")).CreateDir(true);
// create the project .uia file
- m_projectFile.create(theDocument.completeBaseName(), theFinalDir);
+ m_projectFile.create(theDocument.completeBaseName(), theFinalDir.toQString());
// set the default uip file path to the presentations folder
theDocument.setFile(QDir(theDocument.absolutePath() + QStringLiteral("/presentations")),
theDocument.GetFileName().toQString());
- } else {
- m_projectFile.ensureProjectFile(theDocument.toQString());
}
Qt3DSFile fileDocument(theDocument.toCString());