diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-15 01:00:05 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-15 09:36:12 +0200 |
commit | 8bc3329e2cec4638fa9af274a40dda176bbb7352 (patch) | |
tree | 87ebd27e0f6dc305c78fddb956e65bd5922a078b /src/quick/items | |
parent | 75998b22b0b216d925e93d2c0e205025c23b2522 (diff) | |
parent | 6dac2e7df7fbf0f29667bf92b4e72426db47dbe9 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3
Conflicts:
src/3rdparty/masm/assembler/LinkBuffer.h
src/qmltest/doc/src/qtquicktest-index.qdoc
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Change-Id: I7d83ad95cf489dda794dd7a0a33bad3ef3b05609
Diffstat (limited to 'src/quick/items')
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 88d419e2b3..9d0f4a6893 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -4892,10 +4892,18 @@ void QQuickWindow::scheduleRenderJob(QRunnable *job, RenderStage stage) } else if (stage == AfterSwapStage) { d->afterSwapJobs << job; } else if (stage == NoStage) { - if (isExposed()) + if (d->renderControl && openglContext() +#if QT_CONFIG(opengl) + && openglContext()->thread() == QThread::currentThread() +#endif + ) { + job->run(); + delete job; + } else if (isExposed()) { d->windowManager->postJob(this, job); - else + } else { delete job; + } } d->renderJobMutex.unlock(); } |