eric6/VCS/VersionControl.py

branch
maintenance
changeset 8176
31965986ecd1
parent 8043
0acf98cd089a
parent 8143
2c730d5fd177
child 8273
698ae46f40a4
--- a/eric6/VCS/VersionControl.py	Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/VCS/VersionControl.py	Sun Mar 28 15:00:11 2021 +0200
@@ -615,12 +615,12 @@
                 ).format(program))
             return False
         else:
-            while proc.state() == QProcess.Running:
+            while proc.state() == QProcess.ProcessState.Running:
                 QApplication.processEvents()
                 QThread.msleep(300)
                 QApplication.processEvents()
             return (
-                (proc.exitStatus() == QProcess.NormalExit) and
+                (proc.exitStatus() == QProcess.ExitStatus.NormalExit) and
                 (proc.exitCode() == 0)
             )
         
@@ -728,11 +728,14 @@
                 vcsStatusMonitorInterval, project)
             if self.statusMonitorThread is not None:
                 self.statusMonitorThread.vcsStatusMonitorData.connect(
-                    self.__statusMonitorData, Qt.QueuedConnection)
+                    self.__statusMonitorData,
+                    Qt.ConnectionType.QueuedConnection)
                 self.statusMonitorThread.vcsStatusMonitorStatus.connect(
-                    self.__statusMonitorStatus, Qt.QueuedConnection)
+                    self.__statusMonitorStatus,
+                    Qt.ConnectionType.QueuedConnection)
                 self.statusMonitorThread.vcsStatusMonitorInfo.connect(
-                    self.__statusMonitorInfo, Qt.QueuedConnection)
+                    self.__statusMonitorInfo,
+                    Qt.ConnectionType.QueuedConnection)
                 self.statusMonitorThread.setAutoUpdate(
                     Preferences.getVCS("AutoUpdate"))
                 self.statusMonitorThread.start()

eric ide

mercurial