diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:43:36 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:46:48 +0200 |
| commit | 8fc4f99e468a279e6bb8442adad6b6a46d1be1c3 (patch) | |
| tree | dfd0540ecac0bc86594e9e997d7e979e40dacc6d /src/plugins/platforms/xcb/qxcbwindow.cpp | |
| parent | d3921cce47f834dd37cf0bb4085ba242dbbe2412 (diff) | |
| parent | f7241e8cb949ecf2d86fae2a759a8e1fdb148a26 (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If2168c519daf45390af04af9ef9722770453a493
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 64cb9afcc6..cefe1a7786 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -740,7 +740,7 @@ void QXcbWindow::setNetWmStates(NetWmStates states) xcb_flush(xcb_connection()); } -Qt::WindowFlags QXcbWindow::setWindowFlags(Qt::WindowFlags flags) +void QXcbWindow::setWindowFlags(Qt::WindowFlags flags) { Qt::WindowType type = static_cast<Qt::WindowType>(int(flags & Qt::WindowType_Mask)); @@ -763,8 +763,6 @@ Qt::WindowFlags QXcbWindow::setWindowFlags(Qt::WindowFlags flags) setTransparentForMouseEvents(flags & Qt::WindowTransparentForInput); updateDoesNotAcceptFocus(flags & Qt::WindowDoesNotAcceptFocus); - - return flags; } void QXcbWindow::setMotifWindowFlags(Qt::WindowFlags flags) |