summaryrefslogtreecommitdiffstats
path: root/src/runtime/q3dsuippresentation_p.h
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2019-05-16 14:48:49 +0300
committerMahmoud Badri <mahmoud.badri@qt.io>2019-05-17 08:24:29 +0000
commite029927d5f8d1cf485b0680286dd73c76a6882b5 (patch)
treeb4d2fd7be9c62f68e3baa25622aa0dd3a3085e5f /src/runtime/q3dsuippresentation_p.h
parent1bfdb226001d7a323ef9f7ec8017bc2eede5f67b (diff)
Remove 3 obsolete Text props
Task-number: QT3DS-2903 Change-Id: I0674abbdcd11395869cdc7c196c9c1aef3b484f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/runtime/q3dsuippresentation_p.h')
-rw-r--r--src/runtime/q3dsuippresentation_p.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/runtime/q3dsuippresentation_p.h b/src/runtime/q3dsuippresentation_p.h
index fde8233..ee3bf47 100644
--- a/src/runtime/q3dsuippresentation_p.h
+++ b/src/runtime/q3dsuippresentation_p.h
@@ -1568,6 +1568,7 @@ private:
class Q3DSV_PRIVATE_EXPORT Q3DSTextNode : public Q3DSNode
{
Q3DS_OBJECT
+
Q_PROPERTY(QString textstring READ text WRITE setText)
Q_PROPERTY(QColor textcolor READ color WRITE setColor)
Q_PROPERTY(QString font READ font WRITE setFont)
@@ -1580,12 +1581,10 @@ class Q3DSV_PRIVATE_EXPORT Q3DSTextNode : public Q3DSNode
Q_PROPERTY(float shadowStrength READ shadowStrength WRITE setShadowStrength)
Q_PROPERTY(float shadowOffsetX READ shadowOffsetX WRITE setShadowOffsetX)
Q_PROPERTY(float shadowOffsetY READ shadowOffsetY WRITE setShadowOffsetY)
- Q_PROPERTY(float shadowOffset READ shadowOffset WRITE setShadowOffset) // To be removed in 2.x (when UIP version is next updated)
- Q_PROPERTY(HorizontalAlignment shadowHorzAlign READ shadowHorizontalAlignment WRITE setShadowHorizontalAlignment) // To be removed in 2.x (when UIP version is next updated)
- Q_PROPERTY(VerticalAlignment shadowVertAlign READ shadowVerticalAlignment WRITE setShadowVerticalAlignment) // To be removed in 2.x (when UIP version is next updated)
Q_PROPERTY(QVector2D boundingBox READ boundingBox WRITE setBoundingBox)
Q_PROPERTY(WordWrap wordWrap READ wordWrap WRITE setWordWrap)
Q_PROPERTY(Elide elide READ elide WRITE setElide)
+
public:
enum HorizontalAlignment {
Left = 0,
@@ -1639,9 +1638,6 @@ public:
float shadowStrength() const { return m_shadowStrength; }
float shadowOffsetX() const { return m_shadowOffsetX; }
float shadowOffsetY() const { return m_shadowOffsetY; }
- float shadowOffset() const { return m_shadowOffset; } // To be removed in 2.x (when UIP version is next updated)
- HorizontalAlignment shadowHorizontalAlignment() const { return m_shadowHorzAlign; } // To be removed in 2.x (when UIP version is next updated)
- VerticalAlignment shadowVerticalAlignment() const { return m_shadowVertAlign; } // To be removed in 2.x (when UIP version is next updated)
QVector2D boundingBox() const { return m_boundingBox; }
WordWrap wordWrap() const { return m_wordWrap; }
Elide elide() const { return m_elide; }
@@ -1658,9 +1654,6 @@ public:
Q3DSPropertyChange setShadowStrength(float v);
Q3DSPropertyChange setShadowOffsetX(float v);
Q3DSPropertyChange setShadowOffsetY(float v);
- Q3DSPropertyChange setShadowOffset(float v); // To be removed in 2.x (when UIP version is next updated)
- Q3DSPropertyChange setShadowHorizontalAlignment(HorizontalAlignment v); // To be removed in 2.x (when UIP version is next updated)
- Q3DSPropertyChange setShadowVerticalAlignment(VerticalAlignment v); // To be removed in 2.x (when UIP version is next updated)
Q3DSPropertyChange setBoundingBox(const QVector2D &v);
Q3DSPropertyChange setWordWrap(WordWrap v);
Q3DSPropertyChange setElide(Elide v);
@@ -1681,9 +1674,6 @@ private:
float m_shadowStrength = 80;
float m_shadowOffsetX = 0;
float m_shadowOffsetY = 0;
- float m_shadowOffset = 10; // To be removed in 2.x (when UIP version is next updated)
- HorizontalAlignment m_shadowHorzAlign = Right; // To be removed in 2.x (when UIP version is next updated)
- VerticalAlignment m_shadowVertAlign = Bottom; // To be removed in 2.x (when UIP version is next updated)
QVector2D m_boundingBox;
WordWrap m_wordWrap = WrapWord;
Elide m_elide = ElideNone;