From b9866ce98ab6844380a3c54d179c01591bd2e4aa Mon Sep 17 00:00:00 2001 From: Jari Karppinen Date: Thu, 9 May 2019 15:18:23 +0300 Subject: Assume project fonts are in a subdirectory relative to project or presentation Task-number: QT3DS-3353 Change-Id: Iee9719c00b0da9d6e28b0baade9fd26b35f88d79 Reviewed-by: Mahmoud Badri Reviewed-by: Miikka Heikkinen --- src/Authoring/Studio/Render/StudioRenderer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/Authoring/Studio') diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp index dde2d64c..f6361a69 100644 --- a/src/Authoring/Studio/Render/StudioRenderer.cpp +++ b/src/Authoring/Studio/Render/StudioRenderer.cpp @@ -725,16 +725,18 @@ struct SRendererImpl : public IStudioRenderer, Q3DStudio::CString thePath( Q3DStudio::CString::fromQString( StudioUtils::resourcePath() + QStringLiteral("/Font"))); + // For QT3DS-3353 assume project fonts are in a subdirectory relative to project. + QString projectFontPath = projectPath + QStringLiteral("/fonts"); m_Context->GetTextRenderer()->AddSystemFontDirectory( m_Context->GetStringTable().RegisterStr(thePath.c_str())); m_Context->GetTextRenderer()->AddProjectFontDirectory( - m_Context->GetStringTable().RegisterStr(projectPath.toLatin1().data())); + m_Context->GetStringTable().RegisterStr(projectFontPath.toLatin1().data())); if (m_Context->getDistanceFieldRenderer()) { m_Context->getDistanceFieldRenderer()->AddSystemFontDirectory( m_Context->GetStringTable().RegisterStr(thePath.c_str())); m_Context->getDistanceFieldRenderer()->AddProjectFontDirectory( m_Context->GetStringTable().RegisterStr( - projectPath.toLatin1().data())); + projectFontPath.toLatin1().data())); } } } -- cgit v1.2.3