diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-24 11:08:09 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-24 11:33:42 +0200 |
| commit | 9ff09fb283cd130fb717769b44f54bfbb28efd8a (patch) | |
| tree | 711f70b4b494bd996d54bdab5c44f3c89b37a6d1 /src/quick/items/qquickopenglshadereffectnode_p.h | |
| parent | 592b5b49b6c0043fae5db7721689813ebd226032 (diff) | |
| parent | ec2b2a5f5d804095b6b2b8575b1cd1b75a8335ff (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Conflicts:
src/quick/items/qquickopenglshadereffectnode.cpp
src/quick/items/qquickshadereffect.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
src/quick/scenegraph/qsgdefaultglyphnode_p.h
Change-Id: I3d6874b4e4231a89d2836c04fe8e7f2ef2d698c4
Diffstat (limited to 'src/quick/items/qquickopenglshadereffectnode_p.h')
| -rw-r--r-- | src/quick/items/qquickopenglshadereffectnode_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/items/qquickopenglshadereffectnode_p.h b/src/quick/items/qquickopenglshadereffectnode_p.h index 1adfa4dd29..adf5ef730b 100644 --- a/src/quick/items/qquickopenglshadereffectnode_p.h +++ b/src/quick/items/qquickopenglshadereffectnode_p.h @@ -72,7 +72,6 @@ struct QQuickOpenGLShaderEffectMaterialKey { }; QByteArray sourceCode[ShaderTypeCount]; - const char *className; bool operator == (const QQuickOpenGLShaderEffectMaterialKey &other) const; bool operator != (const QQuickOpenGLShaderEffectMaterialKey &other) const; |