From 7f878c6217754dd2b63401bf1c006476e5dc27eb Mon Sep 17 00:00:00 2001 From: Andreas Hartmetz Date: Sat, 29 Aug 2020 10:59:16 +0200 Subject: Remove "fallback session management" With the Qt6 compatibility break, it can finally be removed. Closing windows (which might quit the application with quitOnLastWindowClosed() true, the default) acted contrary to the documentation of the commitDataRequest() signal, which could have been a hint. This removes the workaround API from the fix for QTBUG-49667 and also removes the problematic feature that it worked around. Change-Id: I672be58864ef062df7fb7f2a81658b92c4feedd2 Reviewed-by: Fabian Kosmale --- src/widgets/kernel/qapplication.cpp | 7 ------- src/widgets/kernel/qapplication_p.h | 1 - 2 files changed, 8 deletions(-) (limited to 'src/widgets/kernel') diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 7b467d0a3b..ae888f061e 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -1602,13 +1602,6 @@ retry: return true; } -bool QApplicationPrivate::tryCloseAllWindows() -{ - QWindowList processedWindows; - return QApplicationPrivate::tryCloseAllWidgetWindows(&processedWindows) - && QGuiApplicationPrivate::tryCloseRemainingWindows(processedWindows); -} - /*! Closes all top-level windows. diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 035d3e3220..971ade7284 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -107,7 +107,6 @@ public: virtual void notifyActiveWindowChange(QWindow *) override; virtual bool shouldQuit() override; - bool tryCloseAllWindows() override; static bool autoSipEnabled; static QString desktopStyleKey(); -- cgit v1.2.3