diff -r 77189681b787 -r 51eefa621de4 E5XML/ProjectWriter.py --- a/E5XML/ProjectWriter.py Sat Dec 01 11:45:24 2018 +0100 +++ b/E5XML/ProjectWriter.py Thu Jan 10 14:22:59 2019 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2018 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2019 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -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")