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/Authoring/QT3DSDM/Systems | |
| 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/Authoring/QT3DSDM/Systems')
| -rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | 3 | ||||
| -rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp index 41aa3365..2bd89418 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp @@ -223,11 +223,8 @@ struct DataConstructor<SObjectRefType> #define QT3DS_WCHAR_T_tracking L"tracking" #define QT3DS_WCHAR_T_dropshadow L"dropshadow" #define QT3DS_WCHAR_T_dropshadowstrength L"dropshadowstrength" -#define QT3DS_WCHAR_T_dropshadowoffset L"dropshadowoffset" // To be removed in 2.x (when UIP version is next updated) #define QT3DS_WCHAR_T_dropshadowoffsetx L"dropshadowoffsetx" #define QT3DS_WCHAR_T_dropshadowoffsety L"dropshadowoffsety" -#define QT3DS_WCHAR_T_dropshadowhorzalign L"dropshadowhorzalign" // To be removed in 2.x (when UIP version is next updated) -#define QT3DS_WCHAR_T_dropshadowvertalign L"dropshadowvertalign" // To be removed in 2.x (when UIP version is next updated) #define QT3DS_WCHAR_T_wordwrap L"wordwrap" #define QT3DS_WCHAR_T_boundingbox L"boundingbox" #define QT3DS_WCHAR_T_elide L"elide" diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h index 664fc6f8..1a079402 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h @@ -287,11 +287,8 @@ class IPropertySystem; HANDLE_COMPOSER_PROPERTY(tracking, m_Tracking, float, 0.f) \ HANDLE_COMPOSER_PROPERTY(dropshadow, m_DropShadow, bool, false) \ HANDLE_COMPOSER_PROPERTY(dropshadowstrength, m_DropShadowStrength, float, 80.f) \ - HANDLE_COMPOSER_PROPERTY(dropshadowoffset, m_DropShadowOffset, float, 10.f) \ HANDLE_COMPOSER_PROPERTY(dropshadowoffsetx, m_DropShadowOffsetX, float, 0.f) \ HANDLE_COMPOSER_PROPERTY(dropshadowoffsety, m_DropShadowOffsetY, float, 0.f) \ - HANDLE_COMPOSER_PROPERTY(dropshadowhorzalign, m_DropShadowHorizontalAlignment, TDataStrPtr, L"Right") \ - HANDLE_COMPOSER_PROPERTY(dropshadowvertalign, m_DropShadowVerticalAlignment, TDataStrPtr, L"Bottom") \ HANDLE_COMPOSER_PROPERTY(wordwrap, m_WordWrap, TDataStrPtr, L"WrapWord") \ HANDLE_COMPOSER_PROPERTY(boundingbox, m_BoundingBox, SFloat2, SFloat2(0, 0)) \ HANDLE_COMPOSER_PROPERTY(elide, m_Elide, TDataStrPtr, L"ElideNone") \ |