diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-07-10 09:06:11 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 22:25:01 +0200 |
| commit | b9bb115972b0a6e6c21f2cccc6abe9b7e720bed5 (patch) | |
| tree | 7b4666e4518c0a2b1cb7f067b056d91570a601b1 /src/widgets/kernel/qwidget_qpa.cpp | |
| parent | b1909fe1184860902fe279bb1184d3d9fa3c4c57 (diff) | |
Fix showNormal() and friends for platforms with fullscreen hint
Don't call show() inside of QWidget, as that might make the window
fullscreen due to QStyleHints::showIsFullScreen().
This regression was introduced earlier when QWidget::show() gained
support for the hint. No auto test caught the problem, as the
affected platforms (EGL and QNX) are not CI-tested.
Change-Id: I647c2362ac5b53ced562f1d77848552cc122fba0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget_qpa.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget_qpa.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index a4cbcefb83..ec6d10d0b6 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -656,7 +656,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate) data->in_set_window_state = 0; if (needShow) - show(); + setVisible(true); if (newstate & Qt::WindowActive) activateWindow(); |