diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-09 22:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-09 22:00:15 (GMT) |
| commit | c4876f7b430246d4158528392a7a6f58bb87b23e (patch) | |
| tree | 5893e5433dbd3f7c9bcbdb61c46e5be9298cf313 /src/gui/kernel/qwidget_p.h | |
| parent | e1fead7c4f877308c2cc11131c445a1f7085baf7 (diff) | |
| parent | 4809920df3c3329d47f595c1287ab44b454abb88 (diff) | |
| download | Qt-c4876f7b430246d4158528392a7a6f58bb87b23e.zip Qt-c4876f7b430246d4158528392a7a6f58bb87b23e.tar.gz Qt-c4876f7b430246d4158528392a7a6f58bb87b23e.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 4a79dc7..6c89659 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -748,6 +748,9 @@ public: uint isMoved : 1; uint isGLWidget : 1; uint usesDoubleBufferedGLContext : 1; +#ifndef QT_NO_IM + uint inheritsInputMethodHints : 1; +#endif // *************************** Platform specific ************************************ #if defined(Q_WS_X11) // <----------------------------------------------------------- X11 |