diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 05:56:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-04 05:56:06 +0000 |
| commit | ccad00121d0a9d703cf715c54347b32bfc33bbfc (patch) | |
| tree | 8e492f00f9ea81d87ae9126ad06c3dbc21fee3a3 /src/gui/painting/qpolygon.h | |
| parent | dc2617f35be61b4827b8e3d192c85e2feacf7f6a (diff) | |
| parent | e2f66f921594b7be4af4a058c959557489e86879 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/painting/qpolygon.h')
| -rw-r--r-- | src/gui/painting/qpolygon.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h index ee7d4d31ad..1549ebe2b5 100644 --- a/src/gui/painting/qpolygon.h +++ b/src/gui/painting/qpolygon.h @@ -138,7 +138,7 @@ public: void translate(const QPointF &offset); inline QPolygonF translated(qreal dx, qreal dy) const; - QPolygonF translated(const QPointF &offset) const; + QPolygonF translated(const QPointF &offset) const Q_REQUIRED_RESULT; QPolygon toPolygon() const; @@ -148,9 +148,9 @@ public: bool containsPoint(const QPointF &pt, Qt::FillRule fillRule) const; - QPolygonF united(const QPolygonF &r) const; - QPolygonF intersected(const QPolygonF &r) const; - QPolygonF subtracted(const QPolygonF &r) const; + QPolygonF united(const QPolygonF &r) const Q_REQUIRED_RESULT; + QPolygonF intersected(const QPolygonF &r) const Q_REQUIRED_RESULT; + QPolygonF subtracted(const QPolygonF &r) const Q_REQUIRED_RESULT; }; inline QPolygonF::QPolygonF(int asize) : QVector<QPointF>(asize) {} |