From 9dc8c418e22755857993d78f5c76299374eebe05 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 22 Nov 2021 11:30:53 +0530 Subject: [PATCH] In Qt 6 QApplication::exit now behaves like QApplication::quit in Qt 5 --- src/calibre/gui2/splash_screen.py | 2 +- src/calibre/gui2/tweak_book/boss.py | 4 ++-- src/calibre/gui2/ui.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/splash_screen.py b/src/calibre/gui2/splash_screen.py index b0f64f2406..5554820439 100644 --- a/src/calibre/gui2/splash_screen.py +++ b/src/calibre/gui2/splash_screen.py @@ -113,7 +113,7 @@ class SplashScreen(QSplashScreen): if not self.develop: return QSplashScreen.keyPressEvent(self, ev) ev.accept() - QApplication.instance().quit() + QApplication.instance().exit() def main(): diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py index bd5f99f6b0..b5e33b31a7 100644 --- a/src/calibre/gui2/tweak_book/boss.py +++ b/src/calibre/gui2/tweak_book/boss.py @@ -1882,7 +1882,7 @@ class Boss(QObject): if not self.confirm_quit(): return False self.shutdown() - QApplication.instance().quit() + QApplication.instance().exit() return True def confirm_quit(self): @@ -1935,7 +1935,7 @@ class Boss(QObject): def check_terminal_save(self): if self.doing_terminal_save and not self.save_manager.has_tasks: # terminal save could have been aborted self.shutdown() - QApplication.instance().quit() + QApplication.instance().exit() def shutdown(self): self.save_state() diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 34bafb85e0..c278b7ed52 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -1086,7 +1086,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ if self.system_tray_icon is not None and self.restart_after_quit: # Needed on windows to prevent multiple systray icons self.system_tray_icon.setVisible(False) - QApplication.instance().quit() + QApplication.instance().exit() def donate(self, *args): from calibre.utils.localization import localize_website_link