diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-18 11:07:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 11:07:51 +0200 |
| commit | 0ca4fcbc36527ce02b604aa88e8bd0d37d40baf4 (patch) | |
| tree | 6adf165fb783272d720416a49a51d9ad169d16de /src/widgets/kernel/qwidget_p.h | |
| parent | 9aeaa363e533e1486e6e9d7526bbab7c2472be5e (diff) | |
| parent | 748aa6b06462804a9671997302df292ae9788d5c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/xcb/qxcbintegration.cpp
Change-Id: I2d71d06a55f730df19ace0dd3304238584a0497f
Diffstat (limited to 'src/widgets/kernel/qwidget_p.h')
| -rw-r--r-- | src/widgets/kernel/qwidget_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 71691a4afa..5f50315df5 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -764,7 +764,6 @@ public: void setWindowRole(); void sendStartupMessage(const char *message) const; - void setNetWmWindowTypes(); void x11UpdateIsOpaque(); bool isBackgroundInherited() const; void updateX11AcceptFocus(); @@ -861,6 +860,8 @@ public: static bool qt_widget_rgn(QWidget *, short, RgnHandle, bool); void registerTouchWindow(bool enable = true); #endif + void setNetWmWindowTypes(bool skipIfMissing = false); + bool stealKeyboardGrab(bool grab); bool stealMouseGrab(bool grab); }; |