aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickthreadedwindowmanager_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/items/qquickthreadedwindowmanager_p.h')
-rw-r--r--src/quick/items/qquickthreadedwindowmanager_p.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/quick/items/qquickthreadedwindowmanager_p.h b/src/quick/items/qquickthreadedwindowmanager_p.h
index 1f95d0ddf7..d4878c85d5 100644
--- a/src/quick/items/qquickthreadedwindowmanager_p.h
+++ b/src/quick/items/qquickthreadedwindowmanager_p.h
@@ -63,7 +63,6 @@ public:
: sg(QSGContext::createDefaultContext())
, gl(0)
, animationTimer(-1)
- , allowMainThreadProcessingFlag(false)
, isGuiLocked(0)
, animationRunning(false)
, isPostingSyncEvent(false)
@@ -78,10 +77,10 @@ public:
{
sg->moveToThread(this);
- animationDriver = sg->createAnimationDriver(this);
- animationDriver->install();
- connect(animationDriver, SIGNAL(started()), this, SLOT(animationStarted()));
- connect(animationDriver, SIGNAL(stopped()), this, SLOT(animationStopped()));
+ animDriver = sg->createAnimationDriver(this);
+ animDriver->install();
+ connect(animDriver, SIGNAL(started()), this, SLOT(animationStarted()));
+ connect(animDriver, SIGNAL(stopped()), this, SLOT(animationStopped()));
}
QSGContext *sceneGraphContext() const { return sg; }
@@ -99,7 +98,6 @@ public:
void handleDeferredUpdate();
void maybeUpdate(QQuickWindow *window);
void update(QQuickWindow *window) { maybeUpdate(window); } // identical for this implementation
- void wakeup();
void startRendering();
void stopRendering();
@@ -109,8 +107,6 @@ public:
void initialize();
- volatile bool *allowMainThreadProcessing() { return &allowMainThreadProcessingFlag; }
-
bool event(QEvent *);
inline void lock() { mutex.lock(); }
@@ -132,6 +128,8 @@ public:
return win;
}
+ QAnimationDriver *animationDriver() const { return animDriver; }
+
public slots:
void animationStarted();
void animationStopped();
@@ -144,14 +142,12 @@ private:
QSGContext *sg;
QOpenGLContext *gl;
- QAnimationDriver *animationDriver;
+ QAnimationDriver *animDriver;
int animationTimer;
QMutex mutex;
QWaitCondition condition;
- volatile bool allowMainThreadProcessingFlag;
-
int isGuiLocked;
uint animationRunning: 1;
uint isPostingSyncEvent : 1;