diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-16 09:38:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-16 09:45:16 +0100 |
| commit | 9bfe3ab71e5291445e66be96d6cd1f63934a2d83 (patch) | |
| tree | a3b5580d8788de658f39d5bdb23d84a447999bee /src/plugins/platforms/winrt/qwinrtwindow.h | |
| parent | 28dffdecdad4f3458b9aacec1a04803c7b5483a1 (diff) | |
| parent | 179045f36a16ce2f6cfaad1dbd9443b52b1bf8d3 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/plugins/platforms/android/qandroidplatformopenglcontext.h
src/plugins/platforms/android/qandroidplatformtheme.h
Change-Id: I13d51cc66f708138ff4d667ceea7d515992e58a4
Diffstat (limited to 'src/plugins/platforms/winrt/qwinrtwindow.h')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtwindow.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtwindow.h b/src/plugins/platforms/winrt/qwinrtwindow.h index 968edcfa85..26c2fa800d 100644 --- a/src/plugins/platforms/winrt/qwinrtwindow.h +++ b/src/plugins/platforms/winrt/qwinrtwindow.h @@ -70,6 +70,9 @@ public: qreal devicePixelRatio() const override; void setWindowState(Qt::WindowState state) override; + bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE; + bool setKeyboardGrabEnabled(bool grab) Q_DECL_OVERRIDE; + EGLSurface eglSurface() const; void createEglSurface(EGLDisplay display, EGLConfig config); |