diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:50:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:11:02 +0200 |
| commit | eaec2b664aa2c3cbca13b425901888468a4652a1 (patch) | |
| tree | 93dbd19f3b538baa81dec6c04e5258161f7d8cfb /src/plugins/platforms/ios/qiosscreen.h | |
| parent | 278e557ceacbe7de728987a4a5365f78e56d76b1 (diff) | |
| parent | 31c251765db45a068f1268027e5dd600151af1e5 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/gui/painting/qcoregraphics.mm
src/network/access/qnetworkrequest.h
src/plugins/platforms/cocoa/qcocoahelpers.mm
Change-Id: I81266414c06ea2edf63cbc7e93a86bd5d66a31a5
Diffstat (limited to 'src/plugins/platforms/ios/qiosscreen.h')
| -rw-r--r-- | src/plugins/platforms/ios/qiosscreen.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/ios/qiosscreen.h b/src/plugins/platforms/ios/qiosscreen.h index cc83e7f3d2..9fcce42825 100644 --- a/src/plugins/platforms/ios/qiosscreen.h +++ b/src/plugins/platforms/ios/qiosscreen.h @@ -68,6 +68,8 @@ public: Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE; void setOrientationUpdateMask(Qt::ScreenOrientations mask) Q_DECL_OVERRIDE; + QPixmap grabWindow(WId window, int x, int y, int width, int height) const override; + UIScreen *uiScreen() const; UIWindow *uiWindow() const; |