Commit a951b83c authored by Martin Jones's avatar Martin Jones Committed by Qt by Nokia
Browse files

Cleanup QQuickCanvas and QQuickView docs.


Mark reimplemented protected methods.

Change-Id: I544d68e16d82a37f5612fd72cd185a23c70157a7
Reviewed-by: default avatarAlan Alpert <alan.alpert@nokia.com>
parent fd57a405
dev 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 old/5.0 old/5.1 old/5.2 wip/cmake wip/dbus wip/gc wip/itemviews wip/nacl wip/new-backend wip/pointerhandler wip/propertycache-refactor wip/qquickdeliveryagent wip/scenegraphng wip/tizen wip/webassembly v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1 v5.1.0-beta1 v5.1.0-alpha1 v5.0.2 v5.0.1 v5.0.0 v5.0.0-rc2 v5.0.0-rc1 v5.0.0-beta2 v5.0.0-beta1 qt-v5.0.0-alpha1
No related merge requests found
Showing with 19 additions and 1 deletion
...@@ -163,34 +163,40 @@ QQuickRootItem::QQuickRootItem() ...@@ -163,34 +163,40 @@ QQuickRootItem::QQuickRootItem()
{ {
} }
/*! \reimp */
void QQuickCanvas::exposeEvent(QExposeEvent *) void QQuickCanvas::exposeEvent(QExposeEvent *)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
d->windowManager->exposureChanged(this); d->windowManager->exposureChanged(this);
} }
/*! \reimp */
void QQuickCanvas::resizeEvent(QResizeEvent *) void QQuickCanvas::resizeEvent(QResizeEvent *)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
d->windowManager->resize(this, size()); d->windowManager->resize(this, size());
} }
/*! \reimp */
void QQuickCanvas::showEvent(QShowEvent *) void QQuickCanvas::showEvent(QShowEvent *)
{ {
d_func()->windowManager->show(this); d_func()->windowManager->show(this);
} }
/*! \reimp */
void QQuickCanvas::hideEvent(QHideEvent *) void QQuickCanvas::hideEvent(QHideEvent *)
{ {
d_func()->windowManager->hide(this); d_func()->windowManager->hide(this);
} }
/*! \reimp */
void QQuickCanvas::focusOutEvent(QFocusEvent *) void QQuickCanvas::focusOutEvent(QFocusEvent *)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
d->rootItem->setFocus(false); d->rootItem->setFocus(false);
} }
/*! \reimp */
void QQuickCanvas::focusInEvent(QFocusEvent *) void QQuickCanvas::focusInEvent(QFocusEvent *)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
...@@ -846,7 +852,7 @@ bool QQuickCanvasPrivate::clearHover() ...@@ -846,7 +852,7 @@ bool QQuickCanvasPrivate::clearHover()
return accepted; return accepted;
} }
/*! \reimp */
bool QQuickCanvas::event(QEvent *e) bool QQuickCanvas::event(QEvent *e)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
...@@ -886,6 +892,7 @@ bool QQuickCanvas::event(QEvent *e) ...@@ -886,6 +892,7 @@ bool QQuickCanvas::event(QEvent *e)
return QWindow::event(e); return QWindow::event(e);
} }
/*! \reimp */
void QQuickCanvas::keyPressEvent(QKeyEvent *e) void QQuickCanvas::keyPressEvent(QKeyEvent *e)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
...@@ -894,6 +901,7 @@ void QQuickCanvas::keyPressEvent(QKeyEvent *e) ...@@ -894,6 +901,7 @@ void QQuickCanvas::keyPressEvent(QKeyEvent *e)
sendEvent(d->activeFocusItem, e); sendEvent(d->activeFocusItem, e);
} }
/*! \reimp */
void QQuickCanvas::keyReleaseEvent(QKeyEvent *e) void QQuickCanvas::keyReleaseEvent(QKeyEvent *e)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
...@@ -978,6 +986,7 @@ bool QQuickCanvasPrivate::deliverMouseEvent(QMouseEvent *event) ...@@ -978,6 +986,7 @@ bool QQuickCanvasPrivate::deliverMouseEvent(QMouseEvent *event)
return false; return false;
} }
/*! \reimp */
void QQuickCanvas::mousePressEvent(QMouseEvent *event) void QQuickCanvas::mousePressEvent(QMouseEvent *event)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
...@@ -990,6 +999,7 @@ void QQuickCanvas::mousePressEvent(QMouseEvent *event) ...@@ -990,6 +999,7 @@ void QQuickCanvas::mousePressEvent(QMouseEvent *event)
d->deliverMouseEvent(event); d->deliverMouseEvent(event);
} }
/*! \reimp */
void QQuickCanvas::mouseReleaseEvent(QMouseEvent *event) void QQuickCanvas::mouseReleaseEvent(QMouseEvent *event)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
...@@ -1008,6 +1018,7 @@ void QQuickCanvas::mouseReleaseEvent(QMouseEvent *event) ...@@ -1008,6 +1018,7 @@ void QQuickCanvas::mouseReleaseEvent(QMouseEvent *event)
d->mouseGrabberItem = 0; d->mouseGrabberItem = 0;
} }
/*! \reimp */
void QQuickCanvas::mouseDoubleClickEvent(QMouseEvent *event) void QQuickCanvas::mouseDoubleClickEvent(QMouseEvent *event)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
...@@ -1045,6 +1056,7 @@ bool QQuickCanvasPrivate::sendHoverEvent(QEvent::Type type, QQuickItem *item, ...@@ -1045,6 +1056,7 @@ bool QQuickCanvasPrivate::sendHoverEvent(QEvent::Type type, QQuickItem *item,
return hoverEvent.isAccepted(); return hoverEvent.isAccepted();
} }
/*! \reimp */
void QQuickCanvas::mouseMoveEvent(QMouseEvent *event) void QQuickCanvas::mouseMoveEvent(QMouseEvent *event)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
...@@ -1178,6 +1190,7 @@ bool QQuickCanvasPrivate::deliverWheelEvent(QQuickItem *item, QWheelEvent *event ...@@ -1178,6 +1190,7 @@ bool QQuickCanvasPrivate::deliverWheelEvent(QQuickItem *item, QWheelEvent *event
} }
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
/*! \reimp */
void QQuickCanvas::wheelEvent(QWheelEvent *event) void QQuickCanvas::wheelEvent(QWheelEvent *event)
{ {
Q_D(QQuickCanvas); Q_D(QQuickCanvas);
......
...@@ -497,6 +497,7 @@ void QQuickView::resizeEvent(QResizeEvent *e) ...@@ -497,6 +497,7 @@ void QQuickView::resizeEvent(QResizeEvent *e)
QQuickCanvas::resizeEvent(e); QQuickCanvas::resizeEvent(e);
} }
/*! \reimp */
void QQuickView::keyPressEvent(QKeyEvent *e) void QQuickView::keyPressEvent(QKeyEvent *e)
{ {
QQmlProfilerService::addEvent(QQmlProfilerService::Key); QQmlProfilerService::addEvent(QQmlProfilerService::Key);
...@@ -504,6 +505,7 @@ void QQuickView::keyPressEvent(QKeyEvent *e) ...@@ -504,6 +505,7 @@ void QQuickView::keyPressEvent(QKeyEvent *e)
QQuickCanvas::keyPressEvent(e); QQuickCanvas::keyPressEvent(e);
} }
/*! \reimp */
void QQuickView::keyReleaseEvent(QKeyEvent *e) void QQuickView::keyReleaseEvent(QKeyEvent *e)
{ {
QQmlProfilerService::addEvent(QQmlProfilerService::Key); QQmlProfilerService::addEvent(QQmlProfilerService::Key);
...@@ -511,6 +513,7 @@ void QQuickView::keyReleaseEvent(QKeyEvent *e) ...@@ -511,6 +513,7 @@ void QQuickView::keyReleaseEvent(QKeyEvent *e)
QQuickCanvas::keyReleaseEvent(e); QQuickCanvas::keyReleaseEvent(e);
} }
/*! \reimp */
void QQuickView::mouseMoveEvent(QMouseEvent *e) void QQuickView::mouseMoveEvent(QMouseEvent *e)
{ {
QQmlProfilerService::addEvent(QQmlProfilerService::Mouse); QQmlProfilerService::addEvent(QQmlProfilerService::Mouse);
...@@ -518,6 +521,7 @@ void QQuickView::mouseMoveEvent(QMouseEvent *e) ...@@ -518,6 +521,7 @@ void QQuickView::mouseMoveEvent(QMouseEvent *e)
QQuickCanvas::mouseMoveEvent(e); QQuickCanvas::mouseMoveEvent(e);
} }
/*! \reimp */
void QQuickView::mousePressEvent(QMouseEvent *e) void QQuickView::mousePressEvent(QMouseEvent *e)
{ {
QQmlProfilerService::addEvent(QQmlProfilerService::Mouse); QQmlProfilerService::addEvent(QQmlProfilerService::Mouse);
...@@ -525,6 +529,7 @@ void QQuickView::mousePressEvent(QMouseEvent *e) ...@@ -525,6 +529,7 @@ void QQuickView::mousePressEvent(QMouseEvent *e)
QQuickCanvas::mousePressEvent(e); QQuickCanvas::mousePressEvent(e);
} }
/*! \reimp */
void QQuickView::mouseReleaseEvent(QMouseEvent *e) void QQuickView::mouseReleaseEvent(QMouseEvent *e)
{ {
QQmlProfilerService::addEvent(QQmlProfilerService::Mouse); QQmlProfilerService::addEvent(QQmlProfilerService::Mouse);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment