summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android/qandroidplatformtheme.cpp
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2022-11-07 16:35:42 +0100
committerAlexey Edelev <alexey.edelev@qt.io>2022-11-08 14:08:51 +0100
commit10372c074bf2975ccb5e4afd3bba0f2738e0a1d5 (patch)
tree9ffab03ee39bbda18e9c4693d3d1a1c3b99f6f3a /src/plugins/platforms/android/qandroidplatformtheme.cpp
parentc0b0c7bebb73e1aa609196ce33668a54bd5e0aef (diff)
Make sure that module can be imported by the provided QML import path
When resolving QML module dependencies we scan the produced by the build system import paths for the required QML modules. Previously the check in androiddeployqt only was confirming that the required import starts with the one of import paths. This worked well unless the required import is nested in higher level import path. In the situation when we have the following build structure: build_dir/ imports/ MyModule/ ... and both 'build_dir' and 'build_dir/imports' directories are in QML import paths, the MyModule QML module is resolved by the 'build_dir/imports'. But androiddeployqt assumed that it's found by 'build_dir' import path and copied the whole 'imports' directory as the 'MyModule' QML module. The resulting bundle then had the following content: qml/ imports/ MyModule/ ... ... instead of the correct one: qml/ MyModule/ ... ... This checks if import path contains the required url-based module path before using it as the base directory to copy the module. Amends 0a73fb10005053945571e6cdb0b03d916715c112 Pick-to: 6.2 6.4 Fixes: QTBUG-108194 Change-Id: I79e1a8a67f62e5ae4a899ba1a4f49ee4ad44ebf9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformtheme.cpp')
0 files changed, 0 insertions, 0 deletions