diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-11 10:30:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-11 10:30:48 +0200 |
| commit | 3c662bf13cdc509c1f40c59ad30711c909006b06 (patch) | |
| tree | 8d20ff8e1aaf0f15c768e1f289bcabeed449a4cb /src/gui/kernel | |
| parent | 17790dd030cf05951c6bc886362e5645bb4eb686 (diff) | |
| parent | 2ea3e133c369deefeae0605ad2f32aaea52c9e97 (diff) | |
Merge remote-tracking branch 'origin/5.13.0' into 5.13
Conflicts:
src/plugins/platforms/wasm/qwasmintegration.cpp
src/plugins/platforms/wasm/qwasmintegration.h
Change-Id: Idf4c7936513fb1f21daa8f6105b8545f13447bb8
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qopenglwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qopenglwindow.cpp b/src/gui/kernel/qopenglwindow.cpp index 8b052d92ae..022a47c919 100644 --- a/src/gui/kernel/qopenglwindow.cpp +++ b/src/gui/kernel/qopenglwindow.cpp @@ -440,7 +440,7 @@ void QOpenGLWindow::makeCurrent() d->context->makeCurrent(this); } else { if (!d->offscreenSurface) { - d->offscreenSurface.reset(new QOffscreenSurface); + d->offscreenSurface.reset(new QOffscreenSurface(screen())); d->offscreenSurface->setFormat(d->context->format()); d->offscreenSurface->create(); } |