Respect QPlatformIntegration::ThreadedOpenGL and fix thread affinity of the QSGContext

Change-Id: I3a63e8a3d515bfb41895f7717d534a46e2ab2bde
Reviewed-on: http://codereview.qt.nokia.com/3705
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/declarative/items/qsgcanvas_p.h b/src/declarative/items/qsgcanvas_p.h
index 7daa1423d3..592e66b454 100644
--- a/src/declarative/items/qsgcanvas_p.h
+++ b/src/declarative/items/qsgcanvas_p.h
@@ -200,7 +200,7 @@ public:
     virtual bool isRunning() const = 0;
     virtual void animationStarted() = 0;
     virtual void animationStopped() = 0;
-    virtual void moveCanvasToThread(QSGContext *) { }
+    virtual void moveContextToThread(QSGContext *) { }
 
 protected:
     void initializeSceneGraph() { d->initializeSceneGraph(); }
@@ -262,7 +262,7 @@ public:
     bool isRunning() const { return QThread::isRunning(); }
     void setWindowSize(const QSize &size) { windowSize = size; }
     void maybeUpdate();
-    void moveCanvasToThread(QSGCanvas *c) { c->moveToThread(this); }
+    void moveContextToThread(QSGContext *c) { c->moveToThread(this); }
 
     bool event(QEvent *);