diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-01 14:28:49 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-01 14:28:49 +0200 |
commit | e917c1d5aa66f9ab1f85d820365d421adf15df78 (patch) | |
tree | 6718342ea0fb84eec2abb2e6a6f69d9e69aae580 /src/widgets | |
parent | f05236a40d7ee9299c5855d70e542143a2d342c8 (diff) |
Make tst_QWidget::ensureCreated() pass with -platform xcb.
We need the parent-creation logic to be enabled on QPA as well.
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
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 - } } |