diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 16:25:58 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-05-10 11:53:47 +0200 |
| commit | 66646dd8c37adb488a79ab274b2396a649674e6d (patch) | |
| tree | b0f5ac752a52cec3de1d47692e09295197622dcd /src/quick/scenegraph/qsgthreadedrenderloop_p.h | |
| parent | da15ea0f3b5805db657f13060c21efa78f10cde2 (diff) | |
| parent | d82a17b929dd88fe76258b0f801beaa1b2ee343e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/plugins/accessible/quick/quick.pro
src/quick/items/qquickpincharea.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
Manually adjusted for TestHTTPServer constructor change:
tests/auto/quick/qquickimage/tst_qquickimage.cpp
Change-Id: I5e58a7c08ea92d6fc5e3bce98571c54f7b2ce08f
Diffstat (limited to 'src/quick/scenegraph/qsgthreadedrenderloop_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h index 970bd63040..b86b3c73a4 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h +++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h @@ -87,6 +87,7 @@ private: struct Window { QQuickWindow *window; QSGRenderThread *thread; + QSurfaceFormat actualWindowFormat; int timerId; uint updateDuringSync : 1; }; |