diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-01 16:00:16 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-01 16:00:16 +0200 |
commit | 17613b7addb81927b64bdf28cace66ec58d083d7 (patch) | |
tree | 18b65dc9e23f5e69238e9c096e2fb3f009330281 /src/plugins/platforms | |
parent | d47246a7c63e1f9e2497113f220dc3e18186bf25 (diff) | |
parent | 7c3e1e0ccde93a63e0a0172252c31a4bc445e65d (diff) |
Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index e4f4fd7c0f..2a45d1e7ca 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -118,7 +118,7 @@ void QXcbWindow::create() // XCB_CW_BACK_PIXMAP XCB_NONE, // XCB_CW_OVERRIDE_REDIRECT - type == Qt::Popup, + type == Qt::Popup || type == Qt::ToolTip, // XCB_CW_SAVE_UNDER type == Qt::Popup || type == Qt::Tool || type == Qt::SplashScreen || type == Qt::ToolTip || type == Qt::Drawer, // XCB_CW_EVENT_MASK |