Fix some compiler warnings on Mac
Change-Id: I52b5c1822f9530f75eeebfcafbade6f89062e369 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
parent
dd31340245
commit
b7950b027f
@ -172,8 +172,10 @@ public:
|
|||||||
inline QSize size() const { return geometry().size(); }
|
inline QSize size() const { return geometry().size(); }
|
||||||
inline QPoint pos() const { return geometry().topLeft(); }
|
inline QPoint pos() const { return geometry().topLeft(); }
|
||||||
|
|
||||||
|
#ifdef QT_DEPRECATED
|
||||||
QT_DEPRECATED inline void move(const QPoint &pt) { setPos(pt); }
|
QT_DEPRECATED inline void move(const QPoint &pt) { setPos(pt); }
|
||||||
QT_DEPRECATED inline void move(int posx, int posy) { setPos(posx, posy); }
|
QT_DEPRECATED inline void move(int posx, int posy) { setPos(posx, posy); }
|
||||||
|
#endif
|
||||||
|
|
||||||
inline void setPos(const QPoint &pt) { setGeometry(QRect(pt, size())); }
|
inline void setPos(const QPoint &pt) { setGeometry(QRect(pt, size())); }
|
||||||
inline void setPos(int posx, int posy) { setPos(QPoint(posx, posy)); }
|
inline void setPos(int posx, int posy) { setPos(QPoint(posx, posy)); }
|
||||||
|
@ -64,7 +64,7 @@ public:
|
|||||||
Underline = 0x02,
|
Underline = 0x02,
|
||||||
StrikeOut = 0x04,
|
StrikeOut = 0x04,
|
||||||
RightToLeft = 0x08,
|
RightToLeft = 0x08,
|
||||||
SplitLigature = 0x10,
|
SplitLigature = 0x10
|
||||||
};
|
};
|
||||||
Q_DECLARE_FLAGS(GlyphRunFlags, GlyphRunFlag)
|
Q_DECLARE_FLAGS(GlyphRunFlags, GlyphRunFlag)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user