diff options
| author | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:56:26 +0100 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:56:26 +0100 |
| commit | 774d0310883a9526210c4530bbb9d0af26d88699 (patch) | |
| tree | d79e075f964ef213a31ee290c00d9438f3b139dc /src/quick/scenegraph/qsgthreadedrenderloop_p.h | |
| parent | 9b3d0a24b65f6a0725951a4df0239ef19a8d3f64 (diff) | |
| parent | 811337a73c160447e5218ae55e93df99ac3d9edd (diff) | |
| download | qtdeclarative-baserock/morph.tar.gz | |
Merge v5.1.0 releasebaserock/morph
Diffstat (limited to 'src/quick/scenegraph/qsgthreadedrenderloop_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h index aab0e8726f..6ff5cabf43 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h +++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QSGRenderThread; -class QSGThreadedRenderLoop : public QObject, public QSGRenderLoop +class QSGThreadedRenderLoop : public QSGRenderLoop { Q_OBJECT public: @@ -79,7 +79,7 @@ public: bool event(QEvent *); - void wakeup(); + bool interleaveIncubation() const; public slots: void animationStarted(); @@ -91,7 +91,7 @@ private: void releaseResources(QQuickWindow *window, bool inDestructor); bool checkAndResetForceUpdate(QQuickWindow *window); - bool anyoneShowing(); + bool anyoneShowing() const; void initialize(); void maybePostPolishRequest(); |