diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-28 13:03:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-28 13:03:36 +0100 |
| commit | 1a4f0deeb44e2bfb107a22a714df3796ac1d0c20 (patch) | |
| tree | b1c8db2d1b742d25106225c80893e0b32f98fb15 /src/plugins/platforms/xcb/qxcbwindow.cpp | |
| parent | db0064b767474a89bc72ea4374f477682983c5f4 (diff) | |
| parent | 35fa30e65d26b9e4840cfa793ed8369b3475c1fd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I7d84cfed0b2a122d334b8a920e6e4f18472d2f11
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 46b3f2ab5a..abd41bb942 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -341,11 +341,6 @@ enum { void QXcbWindow::create() { - if (window()->type() == Qt::ForeignWindow) { - m_window = window()->winId(); - return; - } - destroy(); m_windowState = Qt::WindowNoState; @@ -590,9 +585,10 @@ QXcbWindow::~QXcbWindow() if (m_currentBitmapCursor != XCB_CURSOR_NONE) { xcb_free_cursor(xcb_connection(), m_currentBitmapCursor); } - if (window()->type() != Qt::ForeignWindow) - destroy(); - else { + + destroy(); + + if (isForeignWindow()) { if (connection()->mouseGrabber() == this) connection()->setMouseGrabber(Q_NULLPTR); if (connection()->mousePressWindow() == this) |