diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-10-20 19:39:36 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 09:14:24 +0200 |
| commit | b7950b027f8f50002a87c05368e03d568d61023f (patch) | |
| tree | 2a79cbb46b3f4ae7ed3a7fd7c62f399adf2f3fe0 | |
| parent | dd31340245c951d87537aec0cf957798e1d4214f (diff) | |
Fix some compiler warnings on Mac
Change-Id: I52b5c1822f9530f75eeebfcafbade6f89062e369
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | src/gui/kernel/qwindow.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qglyphrun.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 20cc823f2e..44cbfd04e4 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -172,8 +172,10 @@ public: inline QSize size() const { return geometry().size(); } 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(int posx, int posy) { setPos(posx, posy); } +#endif inline void setPos(const QPoint &pt) { setGeometry(QRect(pt, size())); } inline void setPos(int posx, int posy) { setPos(QPoint(posx, posy)); } diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h index 22fb5ff395..826156fe11 100644 --- a/src/gui/text/qglyphrun.h +++ b/src/gui/text/qglyphrun.h @@ -64,7 +64,7 @@ public: Underline = 0x02, StrikeOut = 0x04, RightToLeft = 0x08, - SplitLigature = 0x10, + SplitLigature = 0x10 }; Q_DECLARE_FLAGS(GlyphRunFlags, GlyphRunFlag) |