Add QML2_IMPORT_PATH import paths to qml-import-paths list

QML2_IMPORT_PATH it's usually set by CI to tell the QML apps where to find the QML components Change-Id: I57d1cbc3d0fce9be257648268da0a5f9d61d81e9 Reviewed-by: Andy Shaw <[email protected]>
zoldalis · Aug 24, 2020 · b443775 · b443775
1 parent a735038
commit b443775
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf
@@ -62,8 +62,13 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded {
     !isEmpty(ANDROID_EXTRA_LIBS): \
         FILE_CONTENT += "   \"android-extra-libs\": $$emitString($$join(ANDROID_EXTRA_LIBS, ",")),"
 
-    !isEmpty(QML_IMPORT_PATH): \
-        FILE_CONTENT += "   \"qml-import-paths\": $$emitString($$join(QML_IMPORT_PATH, ",")),"
+    qml_import_paths = $$(QML2_IMPORT_PATH)
+    qml_import_paths = $$split(qml_import_paths, $$DIRLIST_SEPARATOR)
+    qml_import_paths += $$QML_IMPORT_PATH
+    !isEmpty(qml_import_paths) {
+        FILE_CONTENT += "   \"qml-import-paths\": $$emitString($$join(qml_import_paths, ",")),"
+    }
+    unset(qml_import_paths)
 
     isEmpty(QML_ROOT_PATH): \
         QML_ROOT_PATH = $$_PRO_FILE_PWD_