From b9bb115972b0a6e6c21f2cccc6abe9b7e720bed5 Mon Sep 17 00:00:00 2001
From: Thomas McGuire <thomas.mcguire.qnx@kdab.com>
Date: Tue, 10 Jul 2012 09:06:11 +0200
Subject: [PATCH] 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>
---
 src/widgets/kernel/qwidget.cpp     | 6 +++---
 src/widgets/kernel/qwidget_qpa.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 8ef823c41b..bc1d9da2bb 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -2664,7 +2664,7 @@ void QWidget::showMinimized()
 
     if (!isMin)
         setWindowState((windowState() & ~Qt::WindowActive) | Qt::WindowMinimized);
-    show();
+    setVisible(true);
 }
 
 /*!
@@ -2835,7 +2835,7 @@ void QWidget::showMaximized()
         }
     }
 #endif // Q_WS_MAC
-    show();
+    setVisible(true);
 }
 
 /*!
@@ -2864,7 +2864,7 @@ void QWidget::showNormal()
         }
     }
 #endif // Q_WS_MAC
-    show();
+    setVisible(true);
 }
 
 /*!
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();