1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Check that android qml import paths are not empty

Browse Source 
We should check that native_qml_import_paths does not contain
-NOTFOUND before trying to add the qml output directory as an
import path.

Amends b1fc45dbbfcca3ed0c489c01a5faa2f87ed09a35

Cherry picked from qtdeclarative's
1fb4a40b346b1767b3d0f472d101663c14e5d3b2

Task-number: QTBUG-102595
Change-Id: I884ecac3aa1bce77682bf74f22c892eadf310e07
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2022-06-16 19:39:22 +02:00
parent 4912b7670a
commit 71157b9a00
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/Qt6AndroidMacros.cmake
View File

@ -184,7 +184,11 @@ function(qt6_android_generate_deployment_settings target)
# Need to prepend the default qml module output directory to take precedence # Need to prepend the default qml module output directory to take precedence
# over other qml import paths. By default QT_QML_OUTPUT_DIRECTORY is set to # over other qml import paths. By default QT_QML_OUTPUT_DIRECTORY is set to
# ${CMAKE_BINARY_DIR}/android-qml for Android. # ${CMAKE_BINARY_DIR}/android-qml for Android.
list(PREPEND qml_import_path "${QT_QML_OUTPUT_DIRECTORY}") if(qml_import_path)
list(PREPEND qml_import_path "${QT_QML_OUTPUT_DIRECTORY}")
else()
set(qml_import_path "${QT_QML_OUTPUT_DIRECTORY}")
endif()
endif() endif()
if (qml_import_path) if (qml_import_path)
set(_import_paths "") set(_import_paths "")