diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-06 09:46:51 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-06 14:25:20 +0000 |
| commit | 8e860f836bce8fd70a90798f8817a1410d8d8414 (patch) | |
| tree | 9cd4ddc95f3f1e46fd66ee2ddef2d264cac019e1 /src/gui/kernel | |
| parent | 1a0b4b9f26e16532cc3d5532e25d886426ce994e (diff) | |
| parent | a7e4b645dc5b164eb31c22b558ae7a2f5b674afb (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel')
| -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; } |