Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -31,7 +31,8 @@
         super(GitMergeDialog, self).__init__(parent)
         self.setupUi(self)
        
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(False)
         
         self.__currentBranch = currentBranch
         
@@ -61,7 +62,8 @@
         enabled &= (self.commitGroupBox.isChecked() and
                     self.commitMessageEdit.toPlainText() != "")
         
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(enabled)
     
     def __generateDefaultCommitMessage(self):
         """