Merge remote-tracking branch 'origin/release' into stable

Change-Id: I68fd0e1d837bcd918c8efaf67fa88dee4a90b3be

2 files changed, 0 insertions, 17 deletions

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index 9f58876def..0fe23f68ba 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -428,20 +428,6 @@ void QSGRenderContext::registerFontengineForCleanup(QFontEngine *engine)
 }
 
 /*!
-    compile/initialize are protected member functions of QSGMaterialShader.
-    We expose them here for custom renderers.
- */
-void QSGRenderContext::compileShader(QSGMaterialShader *shader)
-{
-    shader->compile();
-}
-
-void QSGRenderContext::initializeShader(QSGMaterialShader *shader)
-{
-    shader->initialize();
-}
-
-/*!
     Initializes the scene graph render context with the GL context \a context. This also
     emits the ready() signal so that the QML graph can start building scene graph nodes.
  */
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();