diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 10:14:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 11:48:14 +0100 |
| commit | b1fa22c1683d9f6cedb001f5ef8a0dac71868935 (patch) | |
| tree | c30a114c75be071310df974283b928329f9d5c12 /src/quick/util/qquickanimatorjob.cpp | |
| parent | ba68c325688acf3072715757480497524f61c425 (diff) | |
| parent | fe5d69669197a51662061b014810f0242eec5ca7 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/quick/accessible/qaccessiblequickview_p.h
src/quick/items/qquickmousearea.cpp
src/quick/util/qquickanimatorjob.cpp
tools/qmlplugindump/main.cpp
Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809
Diffstat (limited to 'src/quick/util/qquickanimatorjob.cpp')
| -rw-r--r-- | src/quick/util/qquickanimatorjob.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp index 5dd16407b8..4aacb09c97 100644 --- a/src/quick/util/qquickanimatorjob.cpp +++ b/src/quick/util/qquickanimatorjob.cpp @@ -47,6 +47,7 @@ #if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl) # include <private/qquickopenglshadereffectnode_p.h> # include <private/qquickopenglshadereffect_p.h> +# include <private/qquickshadereffect_p.h> #endif #include <private/qanimationgroupjob_p.h> @@ -625,7 +626,8 @@ QQuickUniformAnimatorJob::QQuickUniformAnimatorJob() void QQuickUniformAnimatorJob::setTarget(QQuickItem *target) { - if (qobject_cast<QQuickOpenGLShaderEffect *>(target) != nullptr) + QQuickShaderEffect* effect = qobject_cast<QQuickShaderEffect*>(target); + if (effect && effect->isOpenGLShaderEffect()) m_target = target; } |