[ios] fix qrc path required for Qt 5.14.2 for iOS

qgis · Apr 29, 2020 · eb7ce2b · eb7ce2b
1 parent 9ecb94d
commit eb7ce2b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/src/quickgui/plugin/CMakeLists.txt b/src/quickgui/plugin/CMakeLists.txt
@@ -29,7 +29,8 @@ SET(QGIS_QUICK_PLUGIN_RESOURCES
 )
 
 IF (IOS)
-  SET(QGIS_QUICK_PLUGIN_RESOURCES ${QGIS_QUICK_PLUGIN_RESOURCES} ios/qmldir ios/qgsquick.qrc )
+  SET(QGIS_QUICK_PLUGIN_RESOURCES ${QGIS_QUICK_PLUGIN_RESOURCES} ios/qmldir )
+  SET(QGIS_QUICK_PLUGIN_QRC ios/qgsquick.qrc)
 ELSE (IOS)
   SET(QGIS_QUICK_PLUGIN_RESOURCES ${QGIS_QUICK_PLUGIN_RESOURCES} qmldir)
 ENDIF (IOS)
@@ -97,7 +98,7 @@ SET_TARGET_PROPERTIES(qgis_quick_plugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${QG
 TARGET_COMPILE_DEFINITIONS(qgis_quick_plugin PRIVATE "-DQT_NO_FOREACH")
 
 # Copy qml files to output directory, we need qml files in the same directory as the plugin shared library
-FOREACH(qmlfile ${QGIS_QUICK_PLUGIN_RESOURCES})
+FOREACH(qmlfile ${QGIS_QUICK_PLUGIN_RESOURCES} ${QGIS_QUICK_PLUGIN_QRC})
   ADD_CUSTOM_COMMAND(TARGET qgis_quick_plugin
     PRE_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy ${qmlfile} ${QGIS_QUICK_PLUGIN_RUNTIME_DIR}
@@ -137,6 +138,6 @@ INSTALL(TARGETS qgis_quick_plugin
   LIBRARY DESTINATION ${QUICK_PLUGIN_INSTALL_DIR}
   ARCHIVE DESTINATION ${QUICK_PLUGIN_INSTALL_DIR}
 )
-INSTALL(FILES ${QGIS_QUICK_PLUGIN_RESOURCES} ${QGIS_QUICK_PLUGIN_TYPEINFO}
+INSTALL(FILES ${QGIS_QUICK_PLUGIN_RESOURCES} ${QGIS_QUICK_PLUGIN_TYPEINFO} ${QGIS_QUICK_PLUGIN_QRC}
   DESTINATION ${QUICK_PLUGIN_INSTALL_DIR}
 )
diff --git a/src/quickgui/plugin/ios/qgsquick.qrc b/src/quickgui/plugin/ios/qgsquick.qrc
@@ -1,21 +1,21 @@
 <RCC>
     <qresource prefix="/QgsQuick">
         <file>qmldir</file>
-        <file>../editor/qgsquickeditorwidgetcombobox.qml</file>
-        <file>../editor/qgsquickcheckbox.qml</file>
-        <file>../editor/qgsquickdatetime.qml</file>
-        <file>../editor/qgsquickexternalresource.qml</file>
-        <file>../editor/qgsquicktextedit.qml</file>
-        <file>../editor/qgsquickrange.qml</file>
-        <file>../editor/qgsquickvaluemap.qml</file>
-        <file>../editor/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>../components/qgsquickicontextitem.qml</file>
-        <file>../qgsquickscalebar.qml</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>qgsquickicontextitem.qml</file>
+        <file>qgsquickscalebar.qml</file>
     </qresource>
 </RCC>