Move all resources from qml.qrc into CMakeLists.txt

victronenergy · Nov 6, 2023 · b63e04a · b63e04a
1 parent b41001f
commit b63e04a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,10 +40,6 @@ if(QT_KNOWN_POLICY_QTP0001)
     qt_policy(SET QTP0001 NEW) # >Qt6.5 only. Enabling this policy ensures that your QML module is placed under a default import path, and its types can be found without manual calls to QQmlEngine::addImportPath.
 endif()
 
-qt_add_resources(QML_QRC_RESOURCES
-    qml.qrc
-)
-
 include_directories(src/veutil/inc src .)
 
 set (VENUS_QML_MODULE_SINGLETON_SOURCES # All qml singletons have to be added here
@@ -620,7 +616,6 @@ add_custom_command(
     COMMENT "Manually updating translations files"
     COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::lupdate
         ARGS
-            ${CMAKE_CURRENT_SOURCE_DIR}/qml.qrc
             ${SOURCES}
             src
         -ts ${TRANSLATIONS_TS_FILES}
@@ -668,6 +663,13 @@ else()
     )
 endif()
 
+qt_add_qml_module( ${PROJECT_NAME}
+    URI ${PROJECT_NAME}
+    VERSION 1.0
+    RESOURCE_PREFIX /
+    QML_FILES Main.qml
+)
+
 qt_add_qml_module(VenusQMLModule
     URI Victron.VenusOS
     VERSION 2.0

diff --git a/main.qml → Main.qml b/main.qml → Main.qml
diff --git a/qml.qrc b/qml.qrc
diff --git a/src/main.cpp b/src/main.cpp
@@ -345,7 +345,7 @@ int main(int argc, char *argv[])
 	engine.setProperty("screenSize", Victron::VenusOS::Theme::SevenInch);
 #endif
 
-	QQmlComponent component(&engine, QUrl(QStringLiteral("qrc:/main.qml")));
+	QQmlComponent component(&engine, QUrl(QStringLiteral("qrc:/venus-gui-v2/Main.qml")));
 	if (component.isError()) {
 		qWarning() << component.errorString();
 		return EXIT_FAILURE;