--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Mon Mar 01 17:48:43 2021 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Tue Mar 02 17:17:09 2021 +0100 @@ -93,8 +93,8 @@ self.__browserToolbar = QToolBar(self.tr("Browser"), self) self.__browserToolbar.addAction(self.__browserAct) - self.addToolBar(Qt.TopToolBarArea, self.__serverToolbar) - self.addToolBar(Qt.TopToolBarArea, self.__browserToolbar) + self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.__serverToolbar) + self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.__browserToolbar) self.__log = QPlainTextEdit(self) self.setCentralWidget(self.__log) @@ -158,11 +158,11 @@ """ if ( self.process is not None and - self.process.state() != QProcess.NotRunning + self.process.state() != QProcess.ProcessState.NotRunning ): self.process.terminate() self.process.waitForFinished(5000) - if self.process.state() != QProcess.NotRunning: + if self.process.state() != QProcess.ProcessState.NotRunning: self.process.kill() self.__startAct.setEnabled(True) @@ -231,7 +231,7 @@ @type bool """ tc = self.__log.textCursor() - tc.movePosition(QTextCursor.End) + tc.movePosition(QTextCursor.MoveOperation.End) self.__log.setTextCursor(tc) if error: self.__log.setCurrentCharFormat(self.cErrorFormat)