1 files changed, 14 insertions, 13 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h
index f5c640b..844e0de 100644
--- a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h
+++ b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h
@@ -1,23 +1,23 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc
 ** Copyright (C) 2014 Jolla Ltd, author: <gunnar.sletta@jollamobile.com>
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the Qt SceneGraph Raster Add-on.
+** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #ifndef THREADEDRENDERLOOP_H
 #define THREADEDRENDERLOOP_H
 
@@ -43,6 +43,8 @@ public:
 
     void update(QQuickWindow *window);
     void maybeUpdate(QQuickWindow *window);
+    void handleUpdateRequest(QQuickWindow *window);
+
     QSGContext *sceneGraphContext() const;
     QSGRenderContext *createRenderContext(QSGContext *) const;
 
@@ -51,6 +53,7 @@ public:
     void releaseResources(QQuickWindow *window);
 
     bool event(QEvent *);
+    void postJob(QQuickWindow *window, QRunnable *job);
 
     bool interleaveIncubation() const;
 
@@ -63,15 +66,14 @@ private:
         QQuickWindow *window;
         RenderThread *thread;
         QSurfaceFormat actualWindowFormat;
-        int timerId;
         uint updateDuringSync : 1;
+        uint forceRenderPass : 1;
     };
 
     friend class RenderThread;
 
     void releaseResources(Window *window, bool inDestructor);
     bool checkAndResetForceUpdate(QQuickWindow *window);
-    Window *windowForTimer(int timerId) const;
 
     bool anyoneShowing() const;
     void initialize();
@@ -91,7 +93,6 @@ private:
     QList<Window> m_windows;
 
     int m_animation_timer;
-    int m_exhaust_delay;
 
     bool m_lockedForSync;
 };