diff options
| -rw-r--r-- | src/dm/systems/Qt3DSDMWStrOps.h | 4 | ||||
| -rw-r--r-- | src/runtimerender/Qt3DSRenderUIPLoader.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/dm/systems/Qt3DSDMWStrOps.h b/src/dm/systems/Qt3DSDMWStrOps.h index b1e1fb0..71e952b 100644 --- a/src/dm/systems/Qt3DSDMWStrOps.h +++ b/src/dm/systems/Qt3DSDMWStrOps.h @@ -29,6 +29,10 @@ #pragma once #ifndef QT3DSDM_WSTR_OPS_H #define QT3DSDM_WSTR_OPS_H + +// Unicode substitute char to replace linefeed in user-inputted strings in UIP +#define LINE_BREAK_SUBSTITUTE "\uE000" + namespace qt3dsdm { // Template base class so that we can convert items to and from wide string template <typename TDataType> diff --git a/src/runtimerender/Qt3DSRenderUIPLoader.cpp b/src/runtimerender/Qt3DSRenderUIPLoader.cpp index 073df7f..24e4c18 100644 --- a/src/runtimerender/Qt3DSRenderUIPLoader.cpp +++ b/src/runtimerender/Qt3DSRenderUIPLoader.cpp @@ -960,6 +960,10 @@ struct SRenderUIPLoader : public IDOMReferenceResolver { ParseProperties(static_cast<SNode &>(inItem), inParser); ITERATE_QT3DS_RENDER_TEXT_PROPERTIES + // QT3DS-3993: store line feeds as replacement chars in UIP + auto text = QString::fromUtf8(inItem.m_Text); + text.replace(LINE_BREAK_SUBSTITUTE, "\n"); + inItem.m_Text = m_StrTable.RegisterStr(text); } void ParseProperties(SLightmaps &inItem, IPropertyParser &inParser) { |