diff -r dd54d33d21d2 -r 51aa6c6b66f7 eric6/VCS/ProjectHelper.py
--- a/eric6/VCS/ProjectHelper.py Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/VCS/ProjectHelper.py Tue Oct 06 17:52:44 2020 +0200
@@ -223,7 +223,7 @@
vcs = self.project.initVCS(selectedVcsSystem)
if vcs is not None:
vcsdlg = vcs.vcsNewProjectOptionsDialog()
- if vcsdlg.exec_() == QDialog.Accepted:
+ if vcsdlg.exec() == QDialog.Accepted:
projectdir, vcsDataDict = vcsdlg.getData()
# edit VCS command options
if vcs.vcsSupportCommandOptions():
@@ -240,7 +240,7 @@
if vcores:
from .CommandOptionsDialog import VcsCommandOptionsDialog
codlg = VcsCommandOptionsDialog(vcs)
- if codlg.exec_() == QDialog.Accepted:
+ if codlg.exec() == QDialog.Accepted:
vcs.vcsSetOptions(codlg.getOptions())
# create the project directory if it doesn't exist already
@@ -314,7 +314,7 @@
PropertiesDialog
)
dlg = PropertiesDialog(self.project, False)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
dlg.storeData()
self.project.initFileTypes()
self.project.pdata["VCS"] = selectedVcsSystem
@@ -423,7 +423,7 @@
if self.project.vcs is not None:
vcsdlg = self.project.vcs.vcsOptionsDialog(
self.project, self.project.name, 1)
- if vcsdlg.exec_() == QDialog.Accepted:
+ if vcsdlg.exec() == QDialog.Accepted:
vcsDataDict = vcsdlg.getData()
# edit VCS command options
if self.project.vcs.vcsSupportCommandOptions():
@@ -442,7 +442,7 @@
VcsCommandOptionsDialog
)
codlg = VcsCommandOptionsDialog(self.project.vcs)
- if codlg.exec_() == QDialog.Accepted:
+ if codlg.exec() == QDialog.Accepted:
self.project.vcs.vcsSetOptions(codlg.getOptions())
self.project.setDirty(True)
self.project.vcs.vcsSetDataFromDict(vcsDataDict)
@@ -519,7 +519,7 @@
if self.vcs.vcsSupportCommandOptions():
from .CommandOptionsDialog import VcsCommandOptionsDialog
codlg = VcsCommandOptionsDialog(self.vcs)
- if codlg.exec_() == QDialog.Accepted:
+ if codlg.exec() == QDialog.Accepted:
self.vcs.vcsSetOptions(codlg.getOptions())
self.project.setDirty(True)
@@ -604,4 +604,4 @@
from .RepositoryInfoDialog import VcsRepositoryInfoDialog
info = self.vcs.vcsRepositoryInfos(self.project.ppath)
dlg = VcsRepositoryInfoDialog(None, info)
- dlg.exec_()
+ dlg.exec()
