Mercurial Repositories > eric / changeset
changeset
Fixed an issue in GitSubModuleAddDialog caused by PyQt5 prior to 5.6.0 not defining QUrl.None_.
Thu, 18 Jan 2018 11:10:57 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 18 Jan 2018 11:10:57 +0100
- branch
- maintenance
- changeset 6071
- e9bda9b4260b
- parent 6067
- fda50ed9a790
- child 6097
- bf18415da0c7
Fixed an issue in GitSubModuleAddDialog caused by PyQt5 prior to 5.6.0 not defining QUrl.None_.
(grafted from 84e868de5a248f38b97e110054c50733c6f382a8)
| Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Sun Jan 14 13:41:30 2018 +0100 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Thu Jan 18 11:10:57 2018 +0100 @@ -142,8 +142,13 @@ if path: path = self.__getRelativePath(path) + try: + formattingOptions = QUrl.FormattingOptions(QUrl.None_) + except AttributeError: + # for PyQt < 5.6.0 + formattingOptions = QUrl.FormattingOptions(0) return ( - url.toString(QUrl.None_), + url.toString(formattingOptions), self.branchEdit.text(), self.nameEdit.text(), path,
