diff options
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 7 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index ca37664..9c990c3 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -3735,9 +3735,8 @@ void QGestureEvent::accept(const QString &type) */ /*! - Constructs a QTouchEvent with the given \a type and \a - touchPoints. The \a modifiers are the current keyboard modifiers - at the time of the event. + Constructs a QTouchEvent with the given \a type and \a touchPoints. The \a touchPointStates and + \a modifiers are the current touch point states and keyboard modifiers at the time of the event. */ QTouchEvent::QTouchEvent(QEvent::Type type, Qt::KeyboardModifiers modifiers, @@ -3784,7 +3783,7 @@ QTouchEvent::~QTouchEvent() Sets a bitwise OR of all the touch point states for this event. */ -/*! \fn void QTouchEvent::setTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints) +/*! \fn void QTouchEvent::setTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints) \internal diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index ee81e78..ce3f0c0 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -766,7 +766,7 @@ public: { public: TouchPoint(int id = -1); - TouchPoint(const TouchPoint &other); + TouchPoint(const QTouchEvent::TouchPoint &other); ~TouchPoint(); int id() const; @@ -808,7 +808,7 @@ public: void setSceneRect(const QRectF &sceneRect); void setScreenRect(const QRectF &screenRect); void setPressure(qreal pressure); - TouchPoint &operator=(const TouchPoint &other); + QTouchEvent::TouchPoint &operator=(const QTouchEvent::TouchPoint &other); private: QTouchEventTouchPointPrivate *d; |