diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-05 17:58:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-05 18:02:18 +0100 |
| commit | a7e4b645dc5b164eb31c22b558ae7a2f5b674afb (patch) | |
| tree | c58ac922346363c265ad6873cefe9ed205d84a1d /src/gui/math3d/qvector2d.h | |
| parent | cd542a82b0c2d5c9a4ea167a84e5ea8a25c5d969 (diff) | |
| parent | ea0e868c4881944207e9b3a77011e05a505ff3b7 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/corelib/global/minimum-linux.S
src/network/access/qhttpthreaddelegate.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Id2e817e85f85c68f5482c9a12912d35590f9d5f8
Diffstat (limited to 'src/gui/math3d/qvector2d.h')
| -rw-r--r-- | src/gui/math3d/qvector2d.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h index 5e0394b998..2af5132665 100644 --- a/src/gui/math3d/qvector2d.h +++ b/src/gui/math3d/qvector2d.h @@ -137,7 +137,7 @@ Q_DECL_CONSTEXPR inline QVector2D::QVector2D(float xpos, float ypos) : xp(xpos), Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPoint& point) : xp(point.x()), yp(point.y()) {} -Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPointF& point) : xp(point.x()), yp(point.y()) {} +Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPointF& point) : xp(float(point.x())), yp(float(point.y())) {} inline bool QVector2D::isNull() const { |