630d3328dd
When collecting plugins required for the android application according to linked targets we should take into account all prefix directories. But not only the first one. Otherwise the order we use when adding paths to extraPrefixDirs will affect collecting of the plugins. This specifically leads to the issue if the user project builds custom Qt plugins. The plugin directory from user project build tree will be found first and all plugins from Qt installation directory are discarded. Pick-to: 6.6 6.5 Fixes: QTBUG-116920 Change-Id: Id94ebaf5ccd1a279a74b38b59ff535f45230e1b4 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> |
||
---|---|---|
.. | ||
androiddeployqt | ||
androidtestrunner | ||
bootstrap | ||
cmake_automoc_parser | ||
macdeployqt | ||
moc | ||
qdbuscpp2xml | ||
qdbusxml2cpp | ||
qlalr | ||
qtpaths | ||
qvkgen | ||
rcc | ||
shared | ||
syncqt | ||
tracegen | ||
tracepointgen | ||
uic | ||
windeployqt | ||
CMakeLists.txt | ||
configure.cmake |