fix qml loading

qgis · Aug 20, 2019 · 5e84979 · 5e84979
1 parent b47dea0
commit 5e84979
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/src/quickgui/plugin/CMakeLists.txt b/src/quickgui/plugin/CMakeLists.txt
@@ -29,7 +29,7 @@ SET(QGIS_QUICK_PLUGIN_RESOURCES
 )
 
 IF (IOS)
-  SET(QGIS_QUICK_PLUGIN_RESOURCES ${QGIS_QUICK_PLUGIN_RESOURCES} ios/qmldir qgsquick.qrc )
+  SET(QGIS_QUICK_PLUGIN_RESOURCES ${QGIS_QUICK_PLUGIN_RESOURCES} ios/qmldir ios/qgsquick.qrc )
 ELSE (IOS)
   SET(QGIS_QUICK_PLUGIN_RESOURCES ${QGIS_QUICK_PLUGIN_RESOURCES} qmldir)
 ENDIF (IOS)

diff --git a/src/quickgui/plugin/ios/qgsquick.qrc b/src/quickgui/plugin/ios/qgsquick.qrc
@@ -0,0 +1,20 @@
+<RCC>
+    <qresource prefix="/QgsQuick">
+        <file>qmldir</file>
+        <file>qgsquickeditorwidgetcombobox.qml</file>
+        <file>qgsquickcheckbox.qml</file>
+        <file>qgsquickdatetime.qml</file>
+        <file>qgsquickexternalresource.qml</file>
+        <file>qgsquicktextedit.qml</file>
+        <file>qgsquickrange.qml</file>
+        <file>qgsquickvaluemap.qml</file>
+        <file>qgsquickvaluerelation.qml</file>
+        <file>qgsquickfeatureform.qml</file>
+        <file>qgsquickfeatureformstyling.qml</file>
+        <file>qgsquickmapcanvas.qml</file>
+        <file>qgsquickmessagelog.qml</file>
+        <file>qgsquickphotopanel.qml</file>
+        <file>qgsquickpositionmarker.qml</file>
+        <file>qgsquickscalebar.qml</file>
+    </qresource>
+</RCC>
diff --git a/src/quickgui/plugin/ios/qmldir b/src/quickgui/plugin/ios/qmldir
@@ -12,6 +12,10 @@
 
 module QgsQuick
 
+# suppose to be used only internaly in QgsQuick plugin
+EditorWidgetComboBox  0.1 qgsquickeditorwidgetcombobox.qml
+IconTextItem 0.1 qgsquickicontextitem.qml
+
 MapCanvas 0.1 qgsquickmapcanvas.qml
 FeatureForm 0.1 qgsquickfeatureform.qml
 FeatureFormStyling 0.1 qgsquickfeatureformstyling.qml

diff --git a/src/quickgui/plugin/qgsquick.qrc b/src/quickgui/plugin/qgsquick.qrc