Fixed an issue due to renaming of the PySide resource compiler. 5_1_x

Tue, 28 Jun 2011 19:23:57 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 28 Jun 2011 19:23:57 +0200
branch
5_1_x
changeset 1141
3017c0a73c73
parent 1138
3104df9e1fd0
child 1146
8ddb232355b9

Fixed an issue due to renaming of the PySide resource compiler.
(transplanted from 8d1aa04a8f6243a4953075e4972080efc3f90351)

Preferences/ProgramsDialog.py file | annotate | diff | comparison | revisions
Project/ProjectResourcesBrowser.py file | annotate | diff | comparison | revisions
diff -r 3104df9e1fd0 -r 3017c0a73c73 Preferences/ProgramsDialog.py
--- a/Preferences/ProgramsDialog.py	Tue Jun 28 08:04:17 2011 +0200
+++ b/Preferences/ProgramsDialog.py	Tue Jun 28 19:23:57 2011 +0200
@@ -122,7 +122,7 @@
             '--version', 'Python User', 4)
         # 3.c Resource Compiler PySide
         self.__createProgramEntry(self.trUtf8("Resource Compiler (Python, PySide)"), 
-            Utilities.isWindowsPlatform() and "pyside-rcc4.exe" or "pyside-rcc4", 
+            Utilities.isWindowsPlatform() and "pyside-rcc.exe" or "pyside-rcc", 
             '-version', 'Resource Compiler', -1)
         
         # 4. do the Ruby programs
diff -r 3104df9e1fd0 -r 3017c0a73c73 Project/ProjectResourcesBrowser.py
--- a/Project/ProjectResourcesBrowser.py	Tue Jun 28 08:04:17 2011 +0200
+++ b/Project/ProjectResourcesBrowser.py	Tue Jun 28 19:23:57 2011 +0200
@@ -559,7 +559,7 @@
                     else:
                         args.append("-py3")
             elif self.project.getProjectType() == "PySide":
-                self.rccCompiler = 'pyside-rcc4'
+                self.rccCompiler = 'pyside-rcc'
                 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2"]:
                     args.append("-py2")
                 else:

eric ide

mercurial