Mercurial Repositories > eric / changeset

--- a/eric6/Utilities/PySideImporter.py	Tue Dec 22 19:59:29 2020 +0100
+++ b/eric6/Utilities/PySideImporter.py	Wed Dec 23 10:12:14 2020 +0100
@@ -12,7 +12,7 @@
 if __name__ == "__main__":
     pySideVariant = "2"
     if len(sys.argv) == 2:
-        pySideVariant = sys.argv[1].replace("-", "")
+        pySideVariant = sys.argv[1].replace("--variant=", "")
     
     if pySideVariant == "1":
         # no PySide support anymore

--- a/eric6/Utilities/__init__.py	Tue Dec 22 19:59:29 2020 +0100
+++ b/eric6/Utilities/__init__.py	Wed Dec 23 10:12:14 2020 +0100
@@ -1804,14 +1804,14 @@
 ###############################################################################
 
 
-def generatePySideToolPath(toolname, variant="2"):
+def generatePySideToolPath(toolname, variant=2):
     """
     Module function to generate the executable path for a PySide2 tool.
     
     @param toolname base name of the tool
     @type str
     @param variant indicator for the PySide variant (not used)
-    @type str
+    @type int
     @return the PySide2 tool path with extension
     @rtype str
     """
@@ -1866,12 +1866,12 @@
                                 "PySide2", toolname)
 
 
-def checkPyside(variant="2"):
+def checkPyside(variant=2):
     """
     Module function to check the presence of PySide2.
     
     @param variant indicator for the PySide variant (not used)
-    @type str
+    @type int
     @return flags indicating the presence of PySide2
     @rtype bool
     """
@@ -1889,7 +1889,7 @@
     
     checker = os.path.join(
         getConfig('ericDir'), "Utilities", "PySideImporter.py")
-    args = [checker, "-" + variant]
+    args = [checker, "--variant={0}".format(variant)]
     proc = QProcess()
     proc.setProcessChannelMode(QProcess.MergedChannels)
     proc.start(interpreter, args)