~ubuntu-branches/ubuntu/wily/qtdeclarative-opensource-src/wily-proposed

« back to all changes in this revision

Viewing changes to src/quick/scenegraph/coreapi/qsgmaterial.h

  • Committer: Package Import Robot
  • Author(s): Ricardo Salveti de Araujo, Ricardo Salveti de Araujo, Timo Jyrinki
  • Date: 2014-06-19 02:39:21 UTC
  • mfrom: (0.1.18 experimental)
  • Revision ID: package-import@ubuntu.com-20140619023921-yb2oasnuetz9b0fc
Tags: 5.3.0-3ubuntu4
[ Ricardo Salveti de Araujo ]
* debian/control:
  - Updating dependencies as we now also have libqt5quickwidgets5-gles
* libqt5quickwidgets5.symbols: updating to allow gles variant

[ Timo Jyrinki ]
* Update libqt5quickparticles5.symbols from build logs

Show diffs side-by-side

added added

removed removed

Lines of Context:
103
103
    Q_DECLARE_PRIVATE(QSGMaterialShader)
104
104
    QSGMaterialShader(QSGMaterialShaderPrivate &dd);
105
105
 
106
 
    friend class QSGContext;
 
106
    friend class QSGRenderContext;
107
107
    friend class QSGBatchRenderer::ShaderManager;
108
108
 
109
109
    void setShaderSourceFile(QOpenGLShader::ShaderType type, const QString &sourceFile);