diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-10 10:04:29 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-10 10:04:29 (GMT) |
| commit | 7651a4bacf8f34f3700853f147093a073f0472ab (patch) | |
| tree | d47559d6b0c6fc78b091095bbd8b8350c880e91b /src/gui/kernel/qwidget_p.h | |
| parent | 175605f736ce76a9c0296aa607a6a82ea6675542 (diff) | |
| parent | f57a2756ebfb48c2fad94c0c319fa181d2af4dfd (diff) | |
| download | Qt-7651a4bacf8f34f3700853f147093a073f0472ab.zip Qt-7651a4bacf8f34f3700853f147093a073f0472ab.tar.gz Qt-7651a4bacf8f34f3700853f147093a073f0472ab.tar.bz2 | |
Merge remote branch 'remotes/qt/4.6' into lighthouse
Conflicts:
configure
tests/auto/qwidget/tst_qwidget.cpp
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index b8caf29d..e06316a 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -173,6 +173,8 @@ struct QTLWExtra { #ifndef QT_NO_QWS_MANAGER QWSManager *qwsManager; #endif +#elif defined(Q_OS_SYMBIAN) + uint inExpose : 1; // Prevents drawing recursion #endif }; |