diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-23 09:17:38 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-23 09:17:38 (GMT) |
| commit | 8b2c3f7d5259fa6d5b24b090f662c03c16ea9ecb (patch) | |
| tree | be4aaba0a2628cb9782c3954b7bb677b8afc365c /src/gui/kernel/qwidget_p.h | |
| parent | 49ced5b0145598e3eda3375480e915c725bcb81f (diff) | |
| parent | 6a54124fefb786f4bad8fc778d174890fb1824f4 (diff) | |
| download | Qt-8b2c3f7d5259fa6d5b24b090f662c03c16ea9ecb.zip Qt-8b2c3f7d5259fa6d5b24b090f662c03c16ea9ecb.tar.gz Qt-8b2c3f7d5259fa6d5b24b090f662c03c16ea9ecb.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 2cb8586..c32e1a1 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -703,6 +703,7 @@ public: void setNetWmWindowTypes(); void x11UpdateIsOpaque(); bool isBackgroundInherited() const; + void updateX11AcceptFocus(); #elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine() uint nativeGesturePanEnabled : 1; |