diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-29 10:48:54 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-29 10:48:54 +0100 |
| commit | 4e33b069c426c975319d91e11223114fd0d8ad40 (patch) | |
| tree | d73e1251bc313b7303fdb000c0789cdfb4c7bb1f /src/quickwidgets | |
| parent | d9e70d1a49af347f79db7e64bdd8e2e8083a77b5 (diff) | |
| parent | 05d8ffb4dff5e693967c8ee7cee6d6158eadccbd (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/quick/items/qquickaccessibleattached_p.h
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
Change-Id: I8bf07487a75f9d1b0d6efa5914dd06875fc9654d
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index ef6c174b88..83fe586cb8 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -216,8 +216,6 @@ void QQuickWidgetPrivate::render(bool needsSync) QRect rect(QPoint(0, 0), fbo->size()); QOpenGLFramebufferObject::blitFramebuffer(resolvedFbo, rect, fbo, rect); } - - context->doneCurrent(); } void QQuickWidgetPrivate::renderSceneGraph() @@ -735,7 +733,7 @@ void QQuickWidget::createFramebufferObject() format.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil); format.setSamples(samples); - QSize fboSize = size() * window()->devicePixelRatio(); + const QSize fboSize = size() * devicePixelRatio(); // Could be a simple hide - show, in which case the previous fbo is just fine. if (!d->fbo || d->fbo->size() != fboSize) { |