In Qt 6 QApplication::exit now behaves like QApplication::quit in Qt 5

This commit is contained in:
Kovid Goyal 2021-11-22 11:30:53 +05:30
parent d05f6710eb
commit 9dc8c418e2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 4 additions and 4 deletions

View File

@ -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():

View File

@ -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()

View File

@ -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