fix: Improve loading of typesystem files from resources

Ensure that typesystem files are loaded from the Qt resources only
if not found in the specified file path.

Suggested-by: Uwe Siems <[email protected]>

Author: jcfr

generator/build_all.txt

@@ -1,17 +1,17 @@
 <typesystem>
-  <load-typesystem name=":/trolltech/generator/typesystem_general.xml" generate="no" />
-  <load-typesystem name=":/trolltech/generator/typesystem_core.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_gui.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_sql.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_opengl.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_svg.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_network.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_xml.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_webkit.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_webenginewidgets.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_xmlpatterns.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_uitools.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_multimedia.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_qml.xml" generate="yes" />
-  <load-typesystem name=":/trolltech/generator/typesystem_quick.xml" generate="yes" />
+  <load-typesystem name="typesystem_general.xml" generate="no" />
+  <load-typesystem name="typesystem_core.xml" generate="yes" />
+  <load-typesystem name="typesystem_gui.xml" generate="yes" />
+  <load-typesystem name="typesystem_sql.xml" generate="yes" />
+  <load-typesystem name="typesystem_opengl.xml" generate="yes" />
+  <load-typesystem name="typesystem_svg.xml" generate="yes" />
+  <load-typesystem name="typesystem_network.xml" generate="yes" />
+  <load-typesystem name="typesystem_xml.xml" generate="yes" />
+  <load-typesystem name="typesystem_webkit.xml" generate="yes" />
+  <load-typesystem name="typesystem_webenginewidgets.xml" generate="yes" />
+  <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" />
+  <load-typesystem name="typesystem_uitools.xml" generate="yes" />
+  <load-typesystem name="typesystem_multimedia.xml" generate="yes" />
+  <load-typesystem name="typesystem_qml.xml" generate="yes" />
+  <load-typesystem name="typesystem_quick.xml" generate="yes" />
 </typesystem>

generator/typesystem.cpp

@@ -1600,7 +1600,16 @@ bool TypeDatabase::parseFile(const QString &filename, unsigned int qtVersion, bo
 {
     QFile file(filename);
 
-    Q_ASSERT(file.exists());
+    // Attempt to open the file from the specified path
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        // If opening fails, attempt to load from Qt resources
+        file.setFileName(":/trolltech/generator/" + filename);
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            qWarning() << "Could not open file:" << filename;
+            return false;
+        }
+    }
+
     QXmlInputSource source(&file);
 
     int count = m_entries.size();