diff options
| -rw-r--r-- | toolchain/Android.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index a8e3c96e..f0d6ea71 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -241,11 +241,13 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME}) set(EXECUTABLE_DESTINATION_PATH "${EXPORT_DIR}/libs/${ANDROID_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so") set(QML_IMPORT_PATHS "") foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH}) - if(EXISTS "${prefix}/lib/qml") + # qmlimportscanner chokes on symlinks, so we need to resolve those first + get_filename_component(qml_path "${prefix}/lib/qml" REALPATH) + if(EXISTS ${qml_path}) if (QML_IMPORT_PATHS) - set(QML_IMPORT_PATHS "${QML_IMPORT_PATHS},${prefix}/lib/qml") + set(QML_IMPORT_PATHS "${QML_IMPORT_PATHS},${qml_path}") else() - set(QML_IMPORT_PATHS "${prefix}/lib/qml") + set(QML_IMPORT_PATHS "${qml_path}") endif() endif() endforeach() |