From 98ecb149f595d600b10e47a943a400515bcf31c9 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Mon, 14 May 2018 22:42:37 +0200 Subject: Android: Don't define qml-import-paths if it's empty Otherwise androiddeployqt fails like it's failing now for kirigami https://binary-factory.kde.org/view/Android/job/KirigamiGallery_android/48/console --- toolchain/ECMAndroidDeployQt.cmake | 3 +++ toolchain/deployment-file.json.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/toolchain/ECMAndroidDeployQt.cmake b/toolchain/ECMAndroidDeployQt.cmake index d9f3781f..9efcd1ca 100644 --- a/toolchain/ECMAndroidDeployQt.cmake +++ b/toolchain/ECMAndroidDeployQt.cmake @@ -20,6 +20,9 @@ function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET ECM_ADDITIONAL_FIND_ROOT_ endif() endif() endforeach() + if (QML_IMPORT_PATHS) + set(DEFINE_QML_IMPORT_PATHS ""qml-import-paths": \"${QML_IMPORT_PATHS}\",") + endif() set(EXTRA_PREFIX_DIRS "") foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH}) diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index f213f121..6bb086ba 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -9,7 +9,7 @@ "target-architecture": "@ANDROID_ABI@", "application-binary": "@EXECUTABLE_DESTINATION_PATH@", "qml-root-path": "@CMAKE_SOURCE_DIR@", - "qml-import-paths": "@QML_IMPORT_PATHS@", + @DEFINE_QML_IMPORT_PATHS@ ##EXTRALIBS## ##EXTRAPLUGINS## "android-package-source-directory": "@ANDROID_APK_DIR@", -- cgit v1.2.1