diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-13 01:01:09 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-06-13 10:50:36 +0200 |
| commit | 238f619ed35b63413de17991c84ff14e018b859d (patch) | |
| tree | 1236acb09e4b729b0263416375aab02e948a7eef /src/quick/items/qquickshadereffect.cpp | |
| parent | ac402fa6d99eeb519a9cc23b028358dfb6df4d82 (diff) | |
| parent | edb4d0e17fc1c5f94e630f73234f76fa1dbdabf7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/qml/jsruntime/qv4memberdata.cpp
Change-Id: I4e9ffc89d65279a42516f5547e93fb47fb571834
Diffstat (limited to 'src/quick/items/qquickshadereffect.cpp')
| -rw-r--r-- | src/quick/items/qquickshadereffect.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index 3721731f68..eb5256fa4e 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -879,6 +879,8 @@ QString QQuickShaderEffect::parseLog() // for OpenGL-based autotests void QQuickShaderEffectPrivate::updatePolish() { Q_Q(QQuickShaderEffect); + if (!qmlEngine(q)) + return; #if QT_CONFIG(opengl) if (q->m_glImpl) { q->m_glImpl->maybeUpdateShaders(); |