change resource name to avoid conflicts

machinekoder · machinekoder · commit d231534508fe · 2019-12-02T07:57:08.000+01:00
diff --git a/lib/com_machinekoder_livecoding.qrc b/lib/com_machinekoder_livecoding.qrc
diff --git a/lib/cpp_qt_live_coding_plugin.cpp b/lib/cpp_qt_live_coding_plugin.cpp
@@ -8,7 +8,7 @@
 
 static void initResources()
 {
-    Q_INIT_RESOURCE(qml);
+    Q_INIT_RESOURCE(com_machinekoder_livecoding);
 }
 
 static const struct {
@@ -36,7 +36,7 @@ void CppQtLiveCodingPlugin::registerTypes(const char* uri)
 
 void CppQtLiveCodingPlugin::initializeEngine(QQmlEngine* engine, const char* uri)
 {
-    Q_UNUSED(uri);
+    Q_UNUSED(uri)
 
     if (isLoadedFromResource())
         engine->addImportPath(QStringLiteral("qrc:/"));
diff --git a/lib/lib.pro b/lib/lib.pro
@@ -40,4 +40,4 @@ unix {
 }
 
 RESOURCES += \
-    qml.qrc
+    com_machinekoder_livecoding.qrc

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`static void initResources()`
`10`	`10`	`{`
`11`		`- Q_INIT_RESOURCE(qml);`
	`11`	`+ Q_INIT_RESOURCE(com_machinekoder_livecoding);`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`static const struct {`
`@@ -36,7 +36,7 @@ void CppQtLiveCodingPlugin::registerTypes(const char* uri)`
`36`	`36`
`37`	`37`	`void CppQtLiveCodingPlugin::initializeEngine(QQmlEngine* engine, const char* uri)`
`38`	`38`	`{`
`39`		`- Q_UNUSED(uri);`
	`39`	`+ Q_UNUSED(uri)`
`40`	`40`
`41`	`41`	`if (isLoadedFromResource())`
`42`	`42`	`engine->addImportPath(QStringLiteral("qrc:/"));`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,4 @@ unix {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`RESOURCES += \`
`43`		`- qml.qrc`
	`43`	`+ com_machinekoder_livecoding.qrc`