Skip to content

Commit de5c873

Browse files
committed
fix: Ensure typesystem settings can be loaded from Qt resources
This updates `build_all.txt` to reference dependent typesystem files as Qt resources and adds the missing `typesystem_uitools.xml` entry. This change removes the need to copy the `typesystem_*.xml` files alongside the generator executable or start the executable from the generator source directory.
1 parent f4769f1 commit de5c873

File tree

2 files changed

+31
-30
lines changed

2 files changed

+31
-30
lines changed

generator/build_all.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<typesystem>
2-
<load-typesystem name="typesystem_general.xml" generate="no" />
3-
<load-typesystem name="typesystem_core.xml" generate="yes" />
4-
<load-typesystem name="typesystem_gui.xml" generate="yes" />
5-
<load-typesystem name="typesystem_sql.xml" generate="yes" />
6-
<load-typesystem name="typesystem_opengl.xml" generate="yes" />
7-
<load-typesystem name="typesystem_svg.xml" generate="yes" />
8-
<load-typesystem name="typesystem_network.xml" generate="yes" />
9-
<load-typesystem name="typesystem_xml.xml" generate="yes" />
10-
<load-typesystem name="typesystem_webkit.xml" generate="yes" />
11-
<load-typesystem name="typesystem_webenginewidgets.xml" generate="yes" />
12-
<load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" />
13-
<load-typesystem name="typesystem_uitools.xml" generate="yes" />
14-
<load-typesystem name="typesystem_multimedia.xml" generate="yes" />
15-
<load-typesystem name="typesystem_qml.xml" generate="yes" />
16-
<load-typesystem name="typesystem_quick.xml" generate="yes" />
2+
<load-typesystem name=":/trolltech/generator/typesystem_general.xml" generate="no" />
3+
<load-typesystem name=":/trolltech/generator/typesystem_core.xml" generate="yes" />
4+
<load-typesystem name=":/trolltech/generator/typesystem_gui.xml" generate="yes" />
5+
<load-typesystem name=":/trolltech/generator/typesystem_sql.xml" generate="yes" />
6+
<load-typesystem name=":/trolltech/generator/typesystem_opengl.xml" generate="yes" />
7+
<load-typesystem name=":/trolltech/generator/typesystem_svg.xml" generate="yes" />
8+
<load-typesystem name=":/trolltech/generator/typesystem_network.xml" generate="yes" />
9+
<load-typesystem name=":/trolltech/generator/typesystem_xml.xml" generate="yes" />
10+
<load-typesystem name=":/trolltech/generator/typesystem_webkit.xml" generate="yes" />
11+
<load-typesystem name=":/trolltech/generator/typesystem_webenginewidgets.xml" generate="yes" />
12+
<load-typesystem name=":/trolltech/generator/typesystem_xmlpatterns.xml" generate="yes" />
13+
<load-typesystem name=":/trolltech/generator/typesystem_uitools.xml" generate="yes" />
14+
<load-typesystem name=":/trolltech/generator/typesystem_multimedia.xml" generate="yes" />
15+
<load-typesystem name=":/trolltech/generator/typesystem_qml.xml" generate="yes" />
16+
<load-typesystem name=":/trolltech/generator/typesystem_quick.xml" generate="yes" />
1717
</typesystem>

generator/generator.qrc

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
<!DOCTYPE RCC><RCC version="1.0">
2-
<qresource prefix="/trolltech/generator/">
2+
<qresource prefix="/trolltech/generator">
33
<file>qtscript_masterinclude.h</file>
44
<file>build_all.txt</file>
5-
<file alias="typesystem_general.txt">typesystem_general.xml</file>
6-
<file alias="typesystem_core.txt">typesystem_core.xml</file>
7-
<file alias="typesystem_gui.txt">typesystem_gui.xml</file>
8-
<file alias="typesystem_sql.txt">typesystem_sql.xml</file>
9-
<file alias="typesystem_opengl.txt">typesystem_opengl.xml</file>
10-
<file alias="typesystem_svg.txt">typesystem_svg.xml</file>
11-
<file alias="typesystem_network.txt">typesystem_network.xml</file>
12-
<file alias="typesystem_xml.txt">typesystem_xml.xml</file>
13-
<file alias="typesystem_webkit.txt">typesystem_webkit.xml</file>
14-
<file alias="typesystem_webenginewidgets.txt">typesystem_webenginewidgets.xml</file>
15-
<file alias="typesystem_xmlpatterns.txt">typesystem_xmlpatterns.xml</file>
16-
<file alias="typesystem_multimedia.txt">typesystem_multimedia.xml</file>
17-
<file alias="typesystem_qml.txt">typesystem_qml.xml</file>
18-
<file alias="typesystem_quick.txt">typesystem_quick.xml</file>
5+
<file>typesystem_general.xml</file>
6+
<file>typesystem_core.xml</file>
7+
<file>typesystem_gui.xml</file>
8+
<file>typesystem_sql.xml</file>
9+
<file>typesystem_opengl.xml</file>
10+
<file>typesystem_svg.xml</file>
11+
<file>typesystem_network.xml</file>
12+
<file>typesystem_xml.xml</file>
13+
<file>typesystem_webkit.xml</file>
14+
<file>typesystem_webenginewidgets.xml</file>
15+
<file>typesystem_xmlpatterns.xml</file>
16+
<file>typesystem_uitools.xml</file>
17+
<file>typesystem_multimedia.xml</file>
18+
<file>typesystem_qml.xml</file>
19+
<file>typesystem_quick.xml</file>
1920
</qresource>
2021
</RCC>

0 commit comments

Comments
 (0)