diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-15 08:24:36 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-15 08:24:36 (GMT) |
| commit | 22157cb26419ddcaa927cbfa88ad04486b1d1ee0 (patch) | |
| tree | f84ff6878248c791319fc6be1f1956f2177b5bdb /src/gui/kernel/qwidget_p.h | |
| parent | fa6dc19b9212706532f3f88da0fb3542e9c3eafe (diff) | |
| parent | a14b8805945c5e00be26092406a468fd8b8acc14 (diff) | |
| download | Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.zip Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.gz Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index ff8f276..75b4c12 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -174,6 +174,8 @@ struct QTLWExtra { #ifndef QT_NO_QWS_MANAGER QWSManager *qwsManager; #endif +#elif defined(Q_OS_SYMBIAN) + uint inExpose : 1; // Prevents drawing recursion #endif }; @@ -230,7 +232,6 @@ struct QWExtra { #endif #elif defined(Q_OS_SYMBIAN) // <----------------------------------------------------- Symbian uint activated : 1; // RWindowBase::Activated has been called - uint inExpose : 1; // Prevents drawing recursion /** * Defines the behaviour of QSymbianControl::Draw. @@ -685,6 +686,7 @@ public: uint inDirtyList : 1; uint isScrolled : 1; uint isMoved : 1; + uint isGLWidget : 1; uint usesDoubleBufferedGLContext : 1; // *************************** Platform specific ************************************ @@ -716,7 +718,6 @@ public: #elif defined(Q_WS_MAC) // <--------------------------------------------------------- MAC // This is new stuff uint needWindowChange : 1; - uint isGLWidget : 1; // Each wiget keeps a list of all its child and grandchild OpenGL widgets. // This list is used to update the gl context whenever a parent and a granparent |