eric6/VCS/VersionControl.py

changeset 8143
2c730d5fd177
parent 7923
91e843545d9a
child 8176
31965986ecd1
child 8218
7c09585bd960
--- a/eric6/VCS/VersionControl.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/VCS/VersionControl.py	Tue Mar 02 17:17:09 2021 +0100
@@ -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