Fix Android deployment of VectorImage plugins

When selecting which files to automatically bundle in an Android
package, we look at the dependencies of the app and try to infer
which libraries are needed.

For plugins, which specific ones will be loaded is determined at
runtime, so we include any category of plugin that is used by
one or more of the application's dependencies. This is done by
setting the PLUGIN_TYPES of the module. If the application
depends on this module, it will then include all plugins of said
type. For instance, Qt Gui includes all "imageformats".

For vectorimageformats, we had put this dependency on the
VectorImage import, but since this is loaded at runtime, the
deployment tool was not able to determine the dependency on it.
We instead make it a dependency of Qt Quick instead. VectorImage
is technically a part of Qt Quick and any app depending on it
may want to load vector image formats.

Task-number: QTBUG-140187
Pick-to: 6.10
Change-Id: I2ab42a6c23710a97936ae39ace47b19411e2c6a8
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2025-09-17 09:20:35 +02:00
parent 567c5a0b1a
commit 43f7c0d570
2 changed files with 1 additions and 2 deletions

View File

@ -14,7 +14,7 @@ qt_internal_add_qml_module(Quick
CLASS_NAME QtQuick2Plugin
IMPORTS
QtQml/auto
PLUGIN_TYPES scenegraph
PLUGIN_TYPES scenegraph vectorimageformats
SOURCES
handlers/qquickdragaxis.cpp handlers/qquickdragaxis_p.h
handlers/qquickdraghandler.cpp handlers/qquickdraghandler_p.h

View File

@ -6,7 +6,6 @@
#####################################################################
qt_internal_add_module(QuickVectorImageGeneratorPrivate
PLUGIN_TYPES vectorimageformats
INTERNAL_MODULE
SOURCES
generator/qsvgvisitorimpl_p.h generator/qsvgvisitorimpl.cpp