Mercurial Repositories > eric / file diff

--- a/E5XML/ProjectWriter.py	Sat Dec 01 11:39:28 2018 +0100
+++ b/E5XML/ProjectWriter.py	Sat Dec 01 19:07:01 2018 +0100
@@ -14,9 +14,9 @@
 from E5Gui.E5Application import e5App
 
 from .XMLStreamWriterBase import XMLStreamWriterBase
-from .Config import projectFileFormatVersion, projectFileFormatVersionIdl, \
-    projectFileFormatVersionMake, projectFileFormatVersionProto, \
-    projectFileFormatVersionAlt
+from .Config import projectFileFormatVersion, projectFileFormatVersionUic, \
+    projectFileFormatVersionIdl, projectFileFormatVersionMake, \
+    projectFileFormatVersionProto, projectFileFormatVersionAlt
 
 import Preferences
 import Utilities
@@ -45,8 +45,10 @@
         XMLStreamWriterBase.writeXML(self)
         
         project = e5App().getObject("Project")
-        if not project.hasDefaultUicCompilerParameters():
+        if not project.hasDefaultRccCompilerParameters():
             fileFormatVersion = projectFileFormatVersion
+        elif not project.hasDefaultUicCompilerParameters():
+            fileFormatVersion = projectFileFormatVersionUic
         elif not project.hasDefaultIdlCompilerParameters():
             fileFormatVersion = projectFileFormatVersionIdl
         elif not project.hasDefaultMakeParameters():
@@ -241,6 +243,12 @@
             self.writeBasics("UicCompilerParameters", self.pdata["UICPARAMS"])
             self.writeEndElement()
         
+        # do the 'rcc' parameters
+        if not e5App().getObject("Project").hasDefaultRccCompilerParameters():
+            self.writeStartElement("RccCompiler")
+            self.writeBasics("RccCompilerParameters", self.pdata["RCCPARAMS"])
+            self.writeEndElement()
+        
         # do the extra project data stuff
         if len(self.pdata["PROJECTTYPESPECIFICDATA"]):
             self.writeStartElement("ProjectTypeSpecific")