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/kernel/qevent.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/kernel/qevent.h')
| -rw-r--r-- | src/gui/kernel/qevent.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index b3f6d56543..d95da40368 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -205,10 +205,10 @@ public: #ifndef QT_NO_INTEGER_EVENT_COORDINATES inline QPoint pos() const { return p.toPoint(); } inline QPoint globalPos() const { return g.toPoint(); } - inline int x() const { return p.x(); } - inline int y() const { return p.y(); } - inline int globalX() const { return g.x(); } - inline int globalY() const { return g.y(); } + inline int x() const { return int(p.x()); } + inline int y() const { return int(p.y()); } + inline int globalX() const { return int(g.x()); } + inline int globalY() const { return int(g.y()); } #endif inline const QPointF &posF() const { return p; } inline const QPointF &globalPosF() const { return g; } |