diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-27 08:47:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-04-27 08:47:35 +0200 |
| commit | da374438be8f34f746f359aa39ae6c59fd1c4854 (patch) | |
| tree | 2f3e2a2b93b39dfb825339c98580f23e824fad0e /src/particles | |
| parent | 1be53f4e143d417d60cd1f9a292193dab59b5b20 (diff) | |
| parent | 2e6f7f362e62c3285e7d395aca607502c8e8160e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/quick/items/qquickimagebase.cpp
src/imports/layouts/plugin.cpp
Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/qquickcustomparticle.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp index 32b2fd847e..3cb7f6c2bf 100644 --- a/src/particles/qquickcustomparticle.cpp +++ b/src/particles/qquickcustomparticle.cpp @@ -290,8 +290,6 @@ QQuickShaderEffectNode *QQuickCustomParticle::prepareNextFrame(QQuickShaderEffec builder.appendSourceFile(QStringLiteral(":/particles/shaders/customparticle.vert")); s.sourceCode[Key::VertexShader] = builder.source() + s.sourceCode[Key::VertexShader]; - s.className = metaObject()->className(); - material->setProgramSource(s); material->attributes = m_common.attributes; foreach (QQuickShaderEffectNode* node, m_nodes) |