diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-05 16:04:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-05 16:04:57 (GMT) |
| commit | 3a6bbedcea2b5ef15077a67c58e9e59abe904014 (patch) | |
| tree | c2199f9faa005e5082e9fe419fea3b4e85e4c6e7 /src/opengl/qwindowsurface_gl_p.h | |
| parent | 84b5bbc77045cdc267626ff86f309664283abed4 (diff) | |
| parent | 8aa9c7638080e56b124f6542699c45dfbcbba2c0 (diff) | |
| download | Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.zip Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.tar.gz Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/opengl/qwindowsurface_gl_p.h')
| -rw-r--r-- | src/opengl/qwindowsurface_gl_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h index 22bd5f0..09a6a30 100644 --- a/src/opengl/qwindowsurface_gl_p.h +++ b/src/opengl/qwindowsurface_gl_p.h @@ -112,6 +112,9 @@ public: static QGLFormat surfaceFormat; + enum SwapMode { AutomaticSwap, AlwaysFullSwap, AlwaysPartialSwap, KillSwap }; + static SwapMode swapBehavior; + private slots: void deleted(QObject *object); |