Merge branch 'CURA-8591_upgrade_to_qt62' of github.com:Ultimaker/Cura into PyQt6_upgrade

1 files changed, 7 insertions, 7 deletions

diff --git a/cura_app.py b/cura_app.py
index b9a42f0aba..da8b3bc18d 100755
--- a/cura_app.py
+++ b/cura_app.py
@@ -16,7 +16,7 @@ import argparse
 import faulthandler
 import os
 
-from PyQt5.QtNetwork import QSslConfiguration, QSslSocket
+from PyQt6.QtNetwork import QSslConfiguration, QSslSocket
 
 from UM.Platform import Platform
 from cura import ApplicationMetadata
@@ -148,15 +148,15 @@ def exceptHook(hook_type, value, traceback):
     # The flag "CuraApplication.Created" is set to True when CuraApplication finishes its constructor call.
     #
     # Before the "started" flag is set to True, the Qt event loop has not started yet. The event loop is a blocking
-    # call to the QApplication.exec_(). In this case, we need to:
+    # call to the QApplication.exec(). In this case, we need to:
     #   1. Remove all scheduled events so no more unnecessary events will be processed, such as loading the main dialog,
     #      loading the machine, etc.
-    #   2. Start the Qt event loop with exec_() and show the Crash Dialog.
+    #   2. Start the Qt event loop with exec() and show the Crash Dialog.
     #
     # If the application has finished its initialization and was running fine, and then something causes a crash,
     # we run the old routine to show the Crash Dialog.
     #
-    from PyQt5.Qt import QApplication
+    from PyQt6.QtWidgets import QApplication
     if CuraApplication.Created:
         _crash_handler = CrashHandler(hook_type, value, traceback, has_started)
         if CuraApplication.splash is not None:
@@ -164,7 +164,7 @@ def exceptHook(hook_type, value, traceback):
         if not has_started:
             CuraApplication.getInstance().removePostedEvents(None)
             _crash_handler.early_crash_dialog.show()
-            sys.exit(CuraApplication.getInstance().exec_())
+            sys.exit(CuraApplication.getInstance().exec())
         else:
             _crash_handler.show()
     else:
@@ -175,7 +175,7 @@ def exceptHook(hook_type, value, traceback):
         if CuraApplication.splash is not None:
             CuraApplication.splash.close()
         _crash_handler.early_crash_dialog.show()
-        sys.exit(application.exec_())
+        sys.exit(application.exec())
 
 
 # Set exception hook to use the crash dialog handler
@@ -228,7 +228,7 @@ if Platform.isLinux():
     
 if ApplicationMetadata.CuraDebugMode:
     ssl_conf = QSslConfiguration.defaultConfiguration()
-    ssl_conf.setPeerVerifyMode(QSslSocket.VerifyNone)
+    ssl_conf.setPeerVerifyMode(QSslSocket.PeerVerifyMode.VerifyNone)
     QSslConfiguration.setDefaultConfiguration(ssl_conf)
 
 app = CuraApplication()