AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor

Browse Source
This commit is contained in:
Jørgen Lind 2011-06-01 16:00:16 +02:00
commit 17613b7add
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -118,7 +118,7 @@ void QXcbWindow::create()
// XCB_CW_BACK_PIXMAP // XCB_CW_BACK_PIXMAP
XCB_NONE, XCB_NONE,
// XCB_CW_OVERRIDE_REDIRECT // XCB_CW_OVERRIDE_REDIRECT
type == Qt::Popup, type == Qt::Popup || type == Qt::ToolTip,
// XCB_CW_SAVE_UNDER // XCB_CW_SAVE_UNDER
type == Qt::Popup || type == Qt::Tool || type == Qt::SplashScreen || type == Qt::ToolTip || type == Qt::Drawer, type == Qt::Popup || type == Qt::Tool || type == Qt::SplashScreen || type == Qt::ToolTip || type == Qt::Drawer,
// XCB_CW_EVENT_MASK // XCB_CW_EVENT_MASK

8
src/widgets/kernel/qwidget.cpp
View File

@ -1446,7 +1446,6 @@ void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow)
flags |= Qt::Window; flags |= Qt::Window;
} }
#ifndef Q_WS_QPA
if (QWidget *parent = parentWidget()) { if (QWidget *parent = parentWidget()) {
if (type & Qt::Window) { if (type & Qt::Window) {
if (!parent->testAttribute(Qt::WA_WState_Created)) if (!parent->testAttribute(Qt::WA_WState_Created))
@ -1463,7 +1462,6 @@ void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow)
return; return;
} }
} }
#endif //Q_WS_QPA
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
if (flags & Qt::WStaticContents) if (flags & Qt::WStaticContents)
@ -2495,7 +2493,6 @@ void QWidgetPrivate::createWinId(WId winid)
#endif #endif
const bool forceNativeWindow = q->testAttribute(Qt::WA_NativeWindow); const bool forceNativeWindow = q->testAttribute(Qt::WA_NativeWindow);
if (!q->testAttribute(Qt::WA_WState_Created) || (forceNativeWindow && !q->internalWinId())) { if (!q->testAttribute(Qt::WA_WState_Created) || (forceNativeWindow && !q->internalWinId())) {
#ifndef Q_WS_QPA
if (!q->isWindow()) { if (!q->isWindow()) {
QWidget *parent = q->parentWidget(); QWidget *parent = q->parentWidget();
QWidgetPrivate *pd = parent->d_func(); QWidgetPrivate *pd = parent->d_func();
@ -2523,11 +2520,6 @@ void QWidgetPrivate::createWinId(WId winid)
} else { } else {
q->create(); q->create();
} }
#else
Q_UNUSED(winid);
q->create();
#endif //Q_WS_QPA
} }
} }