SoftwareLayer: markDirtyTextureLater() slot was removed

This issue was fixed in qtdeclarative a slightly different way, so now
we need to change our code to reflect the change.

Change-Id: I5c050da88efc32e808ad5a4a764ff410544db1cd
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

2 files changed, 1 insertions, 13 deletions

diff --git a/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp b/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp
index 5dfcf2e20e..037c73a08e 100644
--- a/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp
+++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp
@@ -23,7 +23,6 @@
 
 SoftwareLayer::SoftwareLayer(QSGRenderContext *renderContext)
     : m_item(0)
-    , m_shaderSourceNode(0)
     , m_context(renderContext)
     , m_renderer(0)
     , m_device_pixel_ratio(1)
@@ -87,11 +86,6 @@ void SoftwareLayer::setItem(QSGNode *item)
     markDirtyTexture();
 }
 
-void SoftwareLayer::setShaderSourceNode(QSGNode *node)
-{
-    m_shaderSourceNode = node;
-}
-
 void SoftwareLayer::setRect(const QRectF &rect)
 {
     if (rect == m_rect)
@@ -119,8 +113,6 @@ void SoftwareLayer::scheduleUpdate()
     m_grab = true;
     if (m_dirtyTexture) {
         emit updateRequested();
-        if (m_shaderSourceNode)
-            m_shaderSourceNode->markDirty(QSGNode::DirtyMaterial);
     }
 }
 
@@ -164,8 +156,6 @@ void SoftwareLayer::markDirtyTexture()
     m_dirtyTexture = true;
     if (m_live || m_grab) {
         emit updateRequested();
-        if (m_shaderSourceNode)
-            m_shaderSourceNode->markDirty(QSGNode::DirtyMaterial);
     }
 }
 
@@ -190,7 +180,7 @@ void SoftwareLayer::grab()
 
     if (!m_renderer) {
         m_renderer = new SoftwareContext::PixmapRenderer(m_context);
-        connect(m_renderer, SIGNAL(sceneGraphChanged()), this, SLOT(markDirtyTextureLater()));
+        connect(m_renderer, SIGNAL(sceneGraphChanged()), this, SLOT(markDirtyTexture()));
     }
     m_renderer->setDevicePixelRatio(m_device_pixel_ratio);
     m_renderer->setRootNode(static_cast<QSGRootNode *>(root));
diff --git a/src/plugins/scenegraph/softwarecontext/softwarelayer.h b/src/plugins/scenegraph/softwarecontext/softwarelayer.h
index 3352e6085e..f1529eb1cc 100644
--- a/src/plugins/scenegraph/softwarecontext/softwarelayer.h
+++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.h
@@ -51,7 +51,6 @@ public:
     // QSGLayer interface
 public:
     virtual void setItem(QSGNode *item);
-    virtual void setShaderSourceNode(QSGNode *node);
     virtual void setRect(const QRectF &rect);
     virtual void setSize(const QSize &size);
     virtual void scheduleUpdate();
@@ -70,7 +69,6 @@ private:
     void grab();
 
     QSGNode *m_item;
-    QSGNode *m_shaderSourceNode;
     QSGRenderContext *m_context;
     SoftwareContext::PixmapRenderer *m_renderer;
     QRectF m_rect;