ProjectFormsBrowser: changed code to cope with newer pyside2-uic.

Mon, 09 Mar 2020 19:11:36 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 09 Mar 2020 19:11:36 +0100
changeset 7444
4fa0c1d9ddd7
parent 7443
379b9349287f
child 7445
8077f0b0f0cd

ProjectFormsBrowser: changed code to cope with newer pyside2-uic.

eric6/Project/ProjectFormsBrowser.py file | annotate | diff | comparison | revisions
--- a/eric6/Project/ProjectFormsBrowser.py	Sun Mar 08 17:27:47 2020 +0100
+++ b/eric6/Project/ProjectFormsBrowser.py	Mon Mar 09 19:11:36 2020 +0100
@@ -840,10 +840,6 @@
         ]:
             dirname, filename = os.path.split(ofn)
             self.compiledFile = os.path.join(dirname, "Ui_" + filename + ".py")
-            args.append("-x")
-            indentWidth = Preferences.getQt("PyuicIndent")
-            if indentWidth != self.PyuicIndentDefault:
-                args.append("--indent={0}".format(indentWidth))
             
             if self.project.getProjectType() in ["PySide", "PySide2"]:
                 # PySide and PySide2
@@ -851,6 +847,10 @@
                     args.append("--from-imports")
             else:
                 # PyQt4 and PyQt5
+                args.append("-x")
+                indentWidth = Preferences.getQt("PyuicIndent")
+                if indentWidth != self.PyuicIndentDefault:
+                    args.append("--indent={0}".format(indentWidth))
                 if (
                     'uic5' in uicompiler and
                     self.project.pdata["UICPARAMS"]["Package"]

eric ide

mercurial