diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-24 19:55:03 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-24 19:55:05 +0100 |
| commit | 00be968679152105fece89c3243a457b52d3f268 (patch) | |
| tree | 3ca2128e7df8df3a69095f59cc0e384f7848c57e /src/quick/scenegraph/qsgcontext_p.h | |
| parent | 5130f4a679ae38a1d931384188c021112a44065e (diff) | |
| parent | 7ceefa60ab4f79d5f40e7051edf80c1a77ae7734 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I68fd0e1d837bcd918c8efaf67fa88dee4a90b3be
Diffstat (limited to 'src/quick/scenegraph/qsgcontext_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgcontext_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h index f8d5588649..2ab78ce289 100644 --- a/src/quick/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -115,9 +115,6 @@ public: bool hasBrokenIndexBufferObjects() const { return m_brokenIBOs; } - void compileShader(QSGMaterialShader *shader); - void initializeShader(QSGMaterialShader *shader); - Q_SIGNALS: void initialized(); void invalidated(); |