diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-17 18:23:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-17 16:46:02 +0000 |
| commit | 3d2281ccf7400a782f69b7b74cb45d0889708bcc (patch) | |
| tree | 049703e99771e8cdb19abc33797fcb366d4b2df1 /src/positioning | |
| parent | 572957bb1326190672ea138ccf475c0cf1893192 (diff) | |
| parent | f57956599925dd9eefe70d1b0cc31cb033414a33 (diff) | |
| download | qtlocation-3d2281ccf7400a782f69b7b74cb45d0889708bcc.tar.gz | |
Merge remote-tracking branch 'origin/wip/navigation' into 5.11
Conflicts:
src/location/declarativemaps/qgeomapobject.cpp
src/location/declarativemaps/qgeomapobject_p_p.h
src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h
Change-Id: Iab847e16011b2095d307e2a3610bf9157ae7b92d
Diffstat (limited to 'src/positioning')
| -rw-r--r-- | src/positioning/qdoublevector2d_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/positioning/qdoublevector2d_p.h b/src/positioning/qdoublevector2d_p.h index e944d2f4..92ccfe85 100644 --- a/src/positioning/qdoublevector2d_p.h +++ b/src/positioning/qdoublevector2d_p.h @@ -73,6 +73,7 @@ public: Q_DECL_CONSTEXPR inline double manhattanLength() const; inline bool isNull() const; + inline bool isFinite() const; Q_DECL_CONSTEXPR inline double x() const; Q_DECL_CONSTEXPR inline double y() const; @@ -136,6 +137,11 @@ inline bool QDoubleVector2D::isNull() const return qIsNull(xp) && qIsNull(yp); } +inline bool QDoubleVector2D::isFinite() const +{ + return qIsFinite(xp) && qIsFinite(yp); +} + Q_DECL_CONSTEXPR inline double QDoubleVector2D::x() const { return xp; } Q_DECL_CONSTEXPR inline double QDoubleVector2D::y() const { return yp; } |