diff options
| author | Eskil Abrahamsen Blomfeldt <[email protected]> | 2025-09-17 09:20:35 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <[email protected]> | 2025-09-17 15:31:14 +0200 |
| commit | 43f7c0d5703242eff085a125fc05cdbb39d630ef (patch) | |
| tree | 0b5613b0389ab1d16293a8bf9dd924a80cf6f378 | |
| parent | 567c5a0b1a87b51d636c7ba2499765e537f63c71 (diff) | |
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 <[email protected]>
Reviewed-by: Alexey Edelev <[email protected]>
| -rw-r--r-- | src/quick/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quickvectorimage/CMakeLists.txt | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index a2b5a39ce4..d4323b629b 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -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 diff --git a/src/quickvectorimage/CMakeLists.txt b/src/quickvectorimage/CMakeLists.txt index a179c13603..ab63bc2e39 100644 --- a/src/quickvectorimage/CMakeLists.txt +++ b/src/quickvectorimage/CMakeLists.txt @@ -6,7 +6,6 @@ ##################################################################### qt_internal_add_module(QuickVectorImageGeneratorPrivate - PLUGIN_TYPES vectorimageformats INTERNAL_MODULE SOURCES generator/qsvgvisitorimpl_p.h generator/qsvgvisitorimpl.cpp |