diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-28 13:03:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-28 13:03:36 +0100 |
| commit | 1a4f0deeb44e2bfb107a22a714df3796ac1d0c20 (patch) | |
| tree | b1c8db2d1b742d25106225c80893e0b32f98fb15 /src/gui/kernel/qplatformintegration.h | |
| parent | db0064b767474a89bc72ea4374f477682983c5f4 (diff) | |
| parent | 35fa30e65d26b9e4840cfa793ed8369b3475c1fd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I7d84cfed0b2a122d334b8a920e6e4f18472d2f11
Diffstat (limited to 'src/gui/kernel/qplatformintegration.h')
| -rw-r--r-- | src/gui/kernel/qplatformintegration.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h index 29f7b9b3a6..54904ef60d 100644 --- a/src/gui/kernel/qplatformintegration.h +++ b/src/gui/kernel/qplatformintegration.h @@ -109,6 +109,7 @@ public: virtual QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const; virtual QPlatformWindow *createPlatformWindow(QWindow *window) const = 0; + virtual QPlatformWindow *createForeignWindow(QWindow *, WId) const { return 0; } virtual QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const = 0; #ifndef QT_NO_OPENGL virtual QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const; |