diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-04-20 08:02:05 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-04-20 13:53:57 (GMT) |
| commit | c520a4c75d16948417f6c1a3f42508510be0b5f4 (patch) | |
| tree | 8b4854c1077d645f523a4928f2f5aafde4191ba1 /src/gui/graphicsview/qgraphicsproxywidget.cpp | |
| parent | 9f668a352df15404234ea30bc9bb0c1ef774c1b0 (diff) | |
| download | Qt-c520a4c75d16948417f6c1a3f42508510be0b5f4.zip Qt-c520a4c75d16948417f6c1a3f42508510be0b5f4.tar.gz Qt-c520a4c75d16948417f6c1a3f42508510be0b5f4.tar.bz2 | |
Working on QGraphicsProxyWidget's handling of widget flags.
Diffstat (limited to 'src/gui/graphicsview/qgraphicsproxywidget.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsproxywidget.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp index e660879..f99fef9 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget.cpp +++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp @@ -460,7 +460,7 @@ void QGraphicsProxyWidgetPrivate::embedSubWindow(QWidget *subWin) { QWExtra *extra; if (!((extra = subWin->d_func()->extra) && extra->proxyWidget)) { - QGraphicsProxyWidget *subProxy = new QGraphicsProxyWidget(q_func()); + QGraphicsProxyWidget *subProxy = new QGraphicsProxyWidget(q_func(), subWin->windowFlags()); subProxy->d_func()->setWidget_helper(subWin, false); } } @@ -661,10 +661,6 @@ void QGraphicsProxyWidgetPrivate::setWidget_helper(QWidget *newWidget, bool auto if (newWidget->testAttribute(Qt::WA_SetCursor)) q->setCursor(widget->cursor()); #endif - Qt::WFlags flags = newWidget->windowFlags(); - if (newWidget->windowType() == Qt::Window) - flags &= ~Qt::Window; - q->setWindowFlags(flags); q->setEnabled(newWidget->isEnabled()); q->setVisible(newWidget->isVisible()); q->setLayoutDirection(newWidget->layoutDirection()); |