diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
| commit | 4fabebb332d8409b76e88edc74905f99119f0da4 (patch) | |
| tree | 7dff5241738b7ad5f46bdbbc0c01c2955ee1d5c1 /src/quickwidgets | |
| parent | 561b9323c22a594b402eac343690898d4e9c44d0 (diff) | |
| parent | 131fe1b85311b8ab02498cea5d1dda2188dcdabc (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/quick/util/qquickimageprovider.cpp
Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 7a4c18b579..cc7ece9c5b 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -1150,13 +1150,18 @@ void QQuickWidget::wheelEvent(QWheelEvent *e) } #endif - +/*! + \reimp +*/ void QQuickWidget::focusInEvent(QFocusEvent * event) { Q_D(QQuickWidget); d->offscreenWindow->focusInEvent(event); } +/*! + \reimp +*/ void QQuickWidget::focusOutEvent(QFocusEvent * event) { Q_D(QQuickWidget); |