summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2018-08-10 14:35:31 +0300
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-08-14 03:38:05 +0000
commit07d58b5fe318d1ab2341e7cd3b9802efdd338387 (patch)
treed56f9f65364648fab05a2ac699a3136d18da75c7 /src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
parenta643bc58098cfdfc02784fe485a5fd03f6deb811 (diff)
Improve the project file
Changed the project name and path types to QString instead of the notorious CString and CFilePath. Removed 2 member variables and a method. Also improved the conversion from absolute to relative paths. Task-number: QT3DS-2001 Change-Id: I79619ca2aebd21e5e29abc219a62831ee2117be4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp')
-rw-r--r--src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
index b0504a13..b0ffd273 100644
--- a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
+++ b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
@@ -188,7 +188,7 @@ CCmd *CBasicObjectDropSource::GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandl
// For Text, we need to check if user already has font file inside fonts folder
CFilePath theFontFile;
CFilePath theFontDir = CFilePath::CombineBaseAndRelative(
- g_StudioApp.GetCore()->getProjectFile().getProjectPath(),
+ CFilePath(g_StudioApp.GetCore()->getProjectFile().getProjectPath()),
CFilePath(L"fonts"));
if (!theFontDir.Exists()) {
// Create font dir if necessary