FIX: image / sofaqtquick gui on Linux

sofa-framework · Jan 30, 2017 · e6fc2e6 · e6fc2e6
1 parent b3aa9d8
commit e6fc2e6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/applications-dev/plugins/SofaQtQuickGUI/CMakeLists.txt b/applications-dev/plugins/SofaQtQuickGUI/CMakeLists.txt
@@ -159,8 +159,8 @@ set(PYTHON_FILES
 )
 
 set(QRC_FILES
-    data/resources.qrc
-    data/qml/qml.qrc
+    data/sofaQtQuickGUI_resources.qrc
+    data/qml/sofaQtQuickGUI_qml.qrc
 )
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

diff --git a/applications-dev/plugins/SofaQtQuickGUI/SofaQtQuickGUI.cpp b/applications-dev/plugins/SofaQtQuickGUI/SofaQtQuickGUI.cpp
@@ -58,8 +58,8 @@ SofaQtQuickGUI::SofaQtQuickGUI(QObject *parent) : QQmlExtensionPlugin(parent)
 
 void SofaQtQuickGUI::init()
 {
-    Q_INIT_RESOURCE(qml);
-    Q_INIT_RESOURCE(resources);
+    Q_INIT_RESOURCE(sofaQtQuickGUI_qml);
+    Q_INIT_RESOURCE(sofaQtQuickGUI_resources);
 
     registerTypes("SofaQtQuickGUI");
 

diff --git a/...v/plugins/SofaQtQuickGUI/data/qml/qml.qrc → ...tQuickGUI/data/qml/sofaQtQuickGUI_qml.qrc b/...v/plugins/SofaQtQuickGUI/data/qml/qml.qrc → ...tQuickGUI/data/qml/sofaQtQuickGUI_qml.qrc
diff --git a/...plugins/SofaQtQuickGUI/data/resources.qrc → ...uickGUI/data/sofaQtQuickGUI_resources.qrc b/...plugins/SofaQtQuickGUI/data/resources.qrc → ...uickGUI/data/sofaQtQuickGUI_resources.qrc
diff --git a/applications-dev/plugins/image_qtquickgui/ImageQtQuickGUI.cpp b/applications-dev/plugins/image_qtquickgui/ImageQtQuickGUI.cpp
@@ -32,7 +32,7 @@ const int versionMinor = 0;
 
 static void initResources()
 {
-    Q_INIT_RESOURCE(qml);
+    Q_INIT_RESOURCE(image_qtquickgui_qml);
 }
 
 namespace sofa