From 0240110c58f0d6b694445f6685f0f77b14b769d8 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 18 Jun 2014 14:53:53 +0200
Subject: QMdiArea: Store focus widget when new QMdiSubWindow is added.

Introduce function QMdiSubWindowPrivate::storeFocusWidget()
to store focus widget and call this when de-activating a
sub window. Change restoreFocus() to return a bool and call
it from QMdiSubWindowPrivate::setActive().

Task-number: QTBUG-38378
Change-Id: I18dbe66ce85213ca5b4907b5a09126544415351a
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/widgets/widgets/qmdisubwindow_p.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/widgets/widgets/qmdisubwindow_p.h')

diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h
index 90369ff526..6abbe89b4c 100644
--- a/src/widgets/widgets/qmdisubwindow_p.h
+++ b/src/widgets/widgets/qmdisubwindow_p.h
@@ -266,7 +266,8 @@ public:
     QPalette desktopPalette() const;
     void updateActions();
     void setFocusWidget();
-    void restoreFocus();
+    bool restoreFocus();
+    void storeFocusWidget();
     void setWindowFlags(Qt::WindowFlags windowFlags);
     void setVisible(WindowStateAction, bool visible = true);
 #ifndef QT_NO_ACTION
-- 
cgit v1.2.3