Sort typesystem according to their dependencies to avoid the inclusion of a typesystem with generate=no.

This commit is contained in:
Hugo Parente Lima 2010-10-04 19:04:28 -03:00
commit 4caa8e8ab3

View file

@ -23,9 +23,18 @@
<suppress-warning text="File for inject code not exist: *" /> <suppress-warning text="File for inject code not exist: *" />
<load-typesystem name="typesystem_core.xml" generate="yes"/> <load-typesystem name="typesystem_core.xml" generate="yes"/>
@if_QtDeclarative@
<load-typesystem name="typesystem_declarative.xml" generate="yes"/> @if_QtNetwork@
@end_QtDeclarative@ <load-typesystem name="typesystem_network.xml" generate="yes" />
@end_QtNetwork@
@if_QtXml@
<load-typesystem name="typesystem_xml.xml" generate="yes" />
@end_QtXml@
@if_QtScript@
<load-typesystem name="typesystem_script.xml" generate="yes" />
@end_QtScript@
@if_QtGui@ @if_QtGui@
<load-typesystem name="typesystem_gui.xml" generate="yes"/> <load-typesystem name="typesystem_gui.xml" generate="yes"/>
@ -43,18 +52,14 @@
<load-typesystem name="typesystem_multimedia.xml" generate="yes" /> <load-typesystem name="typesystem_multimedia.xml" generate="yes" />
@end_Multimedia@ @end_Multimedia@
@if_QtNetwork@ @if_QtDeclarative@
<load-typesystem name="typesystem_network.xml" generate="yes" /> <load-typesystem name="typesystem_declarative.xml" generate="yes"/>
@end_QtNetwork@ @end_QtDeclarative@
@if_QtOpenGL@ @if_QtOpenGL@
<load-typesystem name="typesystem_opengl.xml" generate="yes" /> <load-typesystem name="typesystem_opengl.xml" generate="yes" />
@end_QtOpenGL@ @end_QtOpenGL@
@if_QtScript@
<load-typesystem name="typesystem_script.xml" generate="yes" />
@end_QtScript@
@if_QtScriptTools@ @if_QtScriptTools@
<load-typesystem name="typesystem_scripttools.xml" generate="yes" /> <load-typesystem name="typesystem_scripttools.xml" generate="yes" />
@end_QtScriptTools@ @end_QtScriptTools@
@ -79,9 +84,6 @@
<load-typesystem name="typesystem_webkit.xml" generate="yes" /> <load-typesystem name="typesystem_webkit.xml" generate="yes" />
@end_QtWebKit@ @end_QtWebKit@
@if_QtXml@
<load-typesystem name="typesystem_xml.xml" generate="yes" />
@end_QtXml@
@if_QtXmlPatterns@ @if_QtXmlPatterns@
<load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" /> <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" />