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 | |
| parent | d47246a7c63e1f9e2497113f220dc3e18186bf25 (diff) | |
| parent | 7c3e1e0ccde93a63e0a0172252c31a4bc445e65d (diff) | |
Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 8 |
2 files changed, 1 insertions, 9 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 diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 6627fce3e4..83eec1e0b8 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1446,7 +1446,6 @@ void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow) flags |= Qt::Window; } -#ifndef Q_WS_QPA if (QWidget *parent = parentWidget()) { if (type & Qt::Window) { if (!parent->testAttribute(Qt::WA_WState_Created)) @@ -1463,7 +1462,6 @@ void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow) return; } } -#endif //Q_WS_QPA #ifdef QT3_SUPPORT if (flags & Qt::WStaticContents) @@ -2495,7 +2493,6 @@ void QWidgetPrivate::createWinId(WId winid) #endif const bool forceNativeWindow = q->testAttribute(Qt::WA_NativeWindow); if (!q->testAttribute(Qt::WA_WState_Created) || (forceNativeWindow && !q->internalWinId())) { -#ifndef Q_WS_QPA if (!q->isWindow()) { QWidget *parent = q->parentWidget(); QWidgetPrivate *pd = parent->d_func(); @@ -2523,11 +2520,6 @@ void QWidgetPrivate::createWinId(WId winid) } else { q->create(); } -#else - Q_UNUSED(winid); - q->create(); -#endif //Q_WS_QPA - } } |