diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-01-14 12:00:56 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-01-16 12:46:52 +0100 |
| commit | 291aea14636a0e779d874a01630524facb1397dd (patch) | |
| tree | 044ff4131a9b3f5a3edb00e6a807d0609c04a182 /src/quickwidgets | |
| parent | 39f1e0d66dc434e764731fbfed29c8fd98d217aa (diff) | |
| parent | 88e87647c3b7d651dba2c8e61f945d47ecdd02c4 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4debugging.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4functionobject_p.h
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/quick/scenegraph/shaders/visualization.frag
tests/auto/qml/qjsengine/tst_qjsengine.cpp
Change-Id: I492e8546c278f80a300a2129e9a29d861e144a30
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 8 | ||||
| -rw-r--r-- | src/quickwidgets/qquickwidget_p.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 83fe586cb8..6143e4ef0d 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -246,6 +246,11 @@ QImage QQuickWidgetPrivate::grabFramebuffer() return renderControl->grab(); } +QObject *QQuickWidgetPrivate::focusObject() +{ + return offscreenWindow ? offscreenWindow->focusObject() : 0; +} + /*! \module QtQuickWidgets \title Qt Quick Widgets C++ Classes @@ -1086,6 +1091,9 @@ bool QQuickWidget::event(QEvent *e) e->accept(); return true; #endif + case QEvent::InputMethod: + case QEvent::InputMethodQuery: + case QEvent::TouchBegin: case QEvent::TouchEnd: case QEvent::TouchUpdate: diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h index 2ff9601f77..57782a6492 100644 --- a/src/quickwidgets/qquickwidget_p.h +++ b/src/quickwidgets/qquickwidget_p.h @@ -81,6 +81,8 @@ public: void destroyContext(); void handleContextCreationFailure(const QSurfaceFormat &format, bool isEs); + QObject *focusObject() Q_DECL_OVERRIDE; + GLuint textureId() const Q_DECL_OVERRIDE; QImage grabFramebuffer() Q_DECL_OVERRIDE; |