diff options
author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-05-16 14:20:18 +0300 |
---|---|---|
committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-05-16 13:25:20 +0000 |
commit | 09b3156579460b5d1b30ab6b17bd26b8a2f04c08 (patch) | |
tree | 83587b7a355e0b1e528b750b665e4fce5f7fcd91 /src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h | |
parent | 276d7d0f33cc7befb7337a30cfd4e3f9ce3651b2 (diff) |
Increment UIP version
- increment UIP version and show a warning if a UIP version is lower
- remove 3 obsolete text shadow props
- small update to checking for material container in the timeline
- few cleanups
Task-number: QT3DS-3366
Task-number: QT3DS-2903
Change-Id: Ib4d8c33e786001d0e5a18037a52303449630adf5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h')
-rw-r--r-- | src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h index 72ea9c15..bbaaa38d 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h +++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h @@ -173,11 +173,8 @@ namespace render { QT3DSF32 m_Tracking; // space between letters bool m_DropShadow; QT3DSF32 m_DropShadowStrength; - QT3DSF32 m_DropShadowOffset; // To be removed in 2.x (when UIP version is next updated) QT3DSF32 m_DropShadowOffsetX; QT3DSF32 m_DropShadowOffsetY; - TextHorizontalAlignment::Enum m_DropShadowHorizontalAlignment; // To be removed in 2.x (when UIP version is next updated) - TextVerticalAlignment::Enum m_DropShadowVerticalAlignment; // To be removed in 2.x (when UIP version is next updated) TextWordWrap::Enum m_WordWrap; QT3DSVec2 m_BoundingBox; TextElide::Enum m_Elide; @@ -185,7 +182,7 @@ namespace render { QT3DSF32 m_ScaleX; // Pixel scale in X QT3DSF32 m_ScaleY; // Pixel scale in Y - bool m_EnableAcceleratedFont; ///< use NV path rendering + bool m_EnableAcceleratedFont; // use NV path rendering STextRenderInfo(); ~STextRenderInfo(); |