Merge remote-tracking branch 'origin/2.2' into 3.0

# Conflicts:
#	gns3/http_client.py
#	gns3/project.py

gns3/controller.py

@@ -449,7 +449,7 @@ class Controller(QtCore.QObject):
         else:
             self._notification_stream = self._http_client.connectWebSocket(self._websocket, "/notifications/ws")
             self._notification_stream.textMessageReceived.connect(self._websocket_event_received)
-            self._notification_stream.error.connect(self._websocket_error)
+            self._notification_stream.errorOccurred.connect(self._websocket_error)
             self._notification_stream.sslErrors.connect(self._sslErrorsSlot)
             self._notification_stream.disconnected.connect(self._websocket_disconnected)
             url = urlparse(self._notification_stream.requestUrl().toString())

gns3/project.py

@@ -660,7 +660,7 @@ class Project(QtCore.QObject):
             path = "/projects/{project_id}/notifications/ws".format(project_id=self._id)
             self._notification_stream = Controller.instance().httpClient().connectWebSocket(self._websocket, path)
             self._notification_stream.textMessageReceived.connect(self._websocket_event_received)
-            self._notification_stream.error.connect(self._websocket_error)
+            self._notification_stream.errorOccurred.connect(self._websocket_error)
             self._notification_stream.sslErrors.connect(self._sslErrorsSlot)
             url = urlparse(self._notification_stream.requestUrl().toString())
             log.info(f"Listening for project notifications on {url.scheme}://{url.netloc}{url.path}")

mac-requirements.txt

@@ -1,3 +1,3 @@
 -r requirements.txt
 
-PyQt6==6.10.1
+PyQt6==6.10.2

win-requirements.txt

@@ -1,4 +1,4 @@
 -r requirements.txt
 
-PyQt6==6.10.1 # pyup: ignore
+PyQt6==6.10.2 # pyup: ignore
 pywin32==311 # pyup: ignore