1 files changed, 1 insertions, 32 deletions

diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index c74c7eb..83e46e5 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -1210,41 +1210,10 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
         }
 
 #ifdef Q_WS_S60
-        // Hide window decoration when switching to fullscreen / minimized otherwise show decoration.
         // The window decoration visibility has to be changed before doing actual window state
         // change since in that order the availableGeometry will return directly the right size and
         // we will avoid unnecessary redraws
-        Qt::WindowStates comparisonState = newstate;
-        QWidget *parentWindow = parentWidget();
-        if (parentWindow) {
-            while (parentWindow->parentWidget())
-                parentWindow = parentWindow->parentWidget();
-            comparisonState = parentWindow->windowState();
-        } else {
-            parentWindow = this;
-        }
-
-        const bool decorationsVisible = !(comparisonState & (Qt::WindowFullScreen | Qt::WindowMinimized));
-        const bool parentIsFullscreen = comparisonState & Qt::WindowFullScreen;
-        const bool parentCbaVisibilityHint = parentWindow->windowFlags() & Qt::WindowSoftkeysVisibleHint;
-        bool buttonGroupVisibility = (decorationsVisible || (parentIsFullscreen && parentCbaVisibilityHint));
-
-        // For non-toplevel normal and maximized windows, show cba if window has softkey
-        // actions even if topmost parent is not showing cba. Do the same for fullscreen
-        // windows that request it.
-        if (!buttonGroupVisibility
-            && parentWidget()
-            && !(newstate & Qt::WindowMinimized)
-            && ((windowFlags() & Qt::WindowSoftkeysVisibleHint) || !(newstate & Qt::WindowFullScreen))) {
-            for (int i = 0; i < actions().size(); ++i) {
-                if (actions().at(i)->softKeyRole() != QAction::NoSoftKey) {
-                    buttonGroupVisibility = true;
-                    break;
-                }
-            }
-        }
-        S60->setStatusPaneAndButtonGroupVisibility(decorationsVisible, buttonGroupVisibility);
-
+        bool decorationsVisible = S60->setRecursiveDecorationsVisibility(this, newstate);
 #endif // Q_WS_S60
 
         // Ensure the initial size is valid, since we store it as normalGeometry below.