diff options
author | Bastiaan Veelo <Bastiaan@SARC.nl> | 2013-11-16 01:02:22 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-01 15:50:26 +0100 |
commit | 5e99b07a072bedee239ed6980a44719da9ffa7c9 (patch) | |
tree | bb429bcaf50aaa5dc6e41c5c23e8a8ccfb8962d5 /src/widgets/widgets/qmdisubwindow.cpp | |
parent | dd987a9ef08933b970387dac1f9bdd930ca9656c (diff) |
Fix setWindowFlags() for QMdiSubWindow.
It was impossible to hide/show the close button after a QMdiSubWindow
was created.
Task-number: QTBUG-9933
Task-number: QTBUG-27274
[ChangeLog][QtWidgets][QMdiSubWindow] Fixed setWindowFlags() for QMdiSubWindow.
Change-Id: I7db9a1bef5ba8a8ace729acb85682c8b3de9c33c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/widgets/qmdisubwindow.cpp')
-rw-r--r-- | src/widgets/widgets/qmdisubwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index 8e1dcbee18..94674319bc 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -2057,13 +2057,13 @@ void QMdiSubWindowPrivate::restoreFocus() /*! \internal - ### Please add QEvent::WindowFlagsChange event */ void QMdiSubWindowPrivate::setWindowFlags(Qt::WindowFlags windowFlags) { Q_Q(QMdiSubWindow); + if (!parent) { - q->setWindowFlags(windowFlags); + QWidgetPrivate::setWindowFlags(windowFlags); return; } @@ -2097,7 +2097,7 @@ void QMdiSubWindowPrivate::setWindowFlags(Qt::WindowFlags windowFlags) delete sizeGrip; #endif - q->setWindowFlags(windowFlags); + QWidgetPrivate::setWindowFlags(windowFlags); updateGeometryConstraints(); updateActions(); QSize currentSize = q->size(); |